From 2a8ebad6ef0b6473cae06ce9aee5d53be6786fdc Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Tue, 20 Jun 2023 13:17:09 -0500 Subject: [PATCH 01/24] mailbox: k3-sec-proxy: Fill non-message tx data fields with 0x0 Sec proxy data buffer is 60 bytes with the last of the registers indicating transmission completion. This however poses a bit of a challenge. The backing memory for sec_proxy is regular memory, and all sec proxy does is to trigger a burst of all 60 bytes of data over to the target thread backing ring accelerator. It doesn't do a memory scrub when it moves data out in the burst. When we transmit multiple messages, remnants of previous message is also transmitted which results in some random data being set in TISCI fields of messages that have been expanded forward. The entire concept of backward compatibility hinges on the fact that the unused message fields remain 0x0 allowing for 0x0 value to be specially considered when backward compatibility of message extension is done. So, instead of just writing the completion register, we continue to fill the message buffer up with 0x0 (note: for partial message involving completion, we already do this). This allows us to scale and introduce ABI changes back also work with other boot stages that may have left data in the internal memory. While at this, drop the unused accessor function. Fixes: f9aa41023bd9 ("mailbox: Introduce K3 Secure Proxy Driver") Signed-off-by: Nishanth Menon --- drivers/mailbox/k3-sec-proxy.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c index a862e55bc39..815808498f2 100644 --- a/drivers/mailbox/k3-sec-proxy.c +++ b/drivers/mailbox/k3-sec-proxy.c @@ -94,11 +94,6 @@ static inline u32 sp_readl(void __iomem *addr, unsigned int offset) return readl(addr + offset); } -static inline void sp_writel(void __iomem *addr, unsigned int offset, u32 data) -{ - writel(data, addr + offset); -} - /** * k3_sec_proxy_of_xlate() - Translation of phandle to channel * @chan: Mailbox channel @@ -241,15 +236,20 @@ static int k3_sec_proxy_send(struct mbox_chan *chan, const void *data) /* Ensure all unused data is 0 */ data_trail &= 0xFFFFFFFF >> (8 * (sizeof(u32) - trail_bytes)); writel(data_trail, data_reg); - data_reg++; + data_reg += sizeof(u32); } /* * 'data_reg' indicates next register to write. If we did not already * write on tx complete reg(last reg), we must do so for transmit + * In addition, we also need to make sure all intermediate data + * registers(if any required), are reset to 0 for TISCI backward + * compatibility to be maintained. */ - if (data_reg <= (spt->data + spm->desc->data_end_offset)) - sp_writel(spt->data, spm->desc->data_end_offset, 0); + while (data_reg <= (spt->data + spm->desc->data_end_offset)) { + writel(0x0, data_reg); + data_reg += sizeof(u32); + } debug("%s: Message successfully sent on thread %ld\n", __func__, chan->id); From 8fd6e64c953106ec664732032de4a6d4eb21a7c5 Mon Sep 17 00:00:00 2001 From: Philippe Reynes Date: Fri, 23 Jun 2023 18:36:42 +0200 Subject: [PATCH 02/24] drivers: led: bcm6858: do not use null label to find the top This driver considers that a node with an empty label is the top. But the led class has changed, if a label is not provided for a led, the label is filed with the node name. So we update this driver to use a wrapper to manage the top led node. Signed-off-by: Philippe Reynes --- drivers/led/led_bcm6858.c | 112 ++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c index 6b3698674b9..397dc0d8693 100644 --- a/drivers/led/led_bcm6858.c +++ b/drivers/led/led_bcm6858.c @@ -180,63 +180,71 @@ static const struct led_ops bcm6858_led_ops = { static int bcm6858_led_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + struct bcm6858_led_priv *priv = dev_get_priv(dev); + void __iomem *regs; + unsigned int pin, brightness; - /* Top-level LED node */ - if (!uc_plat->label) { - void __iomem *regs; - u32 set_bits = 0; + regs = dev_remap_addr(dev_get_parent(dev)); + if (!regs) + return -EINVAL; - regs = dev_remap_addr(dev); - if (!regs) - return -EINVAL; + pin = dev_read_u32_default(dev, "reg", LEDS_MAX); + if (pin >= LEDS_MAX) + return -EINVAL; - if (dev_read_bool(dev, "brcm,serial-led-msb-first")) - set_bits |= LED_CTRL_SERIAL_LED_MSB_FIRST; - if (dev_read_bool(dev, "brcm,serial-led-en-pol")) - set_bits |= LED_CTRL_SERIAL_LED_EN_POL; - if (dev_read_bool(dev, "brcm,serial-led-clk-pol")) - set_bits |= LED_CTRL_SERIAL_LED_CLK_POL; - if (dev_read_bool(dev, "brcm,serial-led-data-ppol")) - set_bits |= LED_CTRL_SERIAL_LED_DATA_PPOL; - if (dev_read_bool(dev, "brcm,led-test-mode")) - set_bits |= LED_CTRL_LED_TEST_MODE; + priv->regs = regs; + priv->pin = pin; - clrsetbits_32(regs + LED_CTRL_REG, ~0, set_bits); - } else { - struct bcm6858_led_priv *priv = dev_get_priv(dev); - void __iomem *regs; - unsigned int pin, brightness; + /* this led is managed by software */ + clrbits_32(regs + LED_HW_LED_EN_REG, 1 << pin); - regs = dev_remap_addr(dev_get_parent(dev)); - if (!regs) - return -EINVAL; + /* configure the polarity */ + if (dev_read_bool(dev, "active-low")) + clrbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); + else + setbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); - pin = dev_read_u32_default(dev, "reg", LEDS_MAX); - if (pin >= LEDS_MAX) - return -EINVAL; - - priv->regs = regs; - priv->pin = pin; - - /* this led is managed by software */ - clrbits_32(regs + LED_HW_LED_EN_REG, 1 << pin); - - /* configure the polarity */ - if (dev_read_bool(dev, "active-low")) - clrbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); - else - setbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); - - brightness = dev_read_u32_default(dev, "default-brightness", + brightness = dev_read_u32_default(dev, "default-brightness", LEDS_MAX_BRIGHTNESS); - led_set_brightness(dev, brightness); - } + led_set_brightness(dev, brightness); return 0; } -static int bcm6858_led_bind(struct udevice *parent) +U_BOOT_DRIVER(bcm6858_led) = { + .name = "bcm6858-led", + .id = UCLASS_LED, + .probe = bcm6858_led_probe, + .priv_auto = sizeof(struct bcm6858_led_priv), + .ops = &bcm6858_led_ops, +}; + +static int bcm6858_led_wrap_probe(struct udevice *dev) +{ + void __iomem *regs; + u32 set_bits = 0; + + regs = dev_remap_addr(dev); + if (!regs) + return -EINVAL; + + if (dev_read_bool(dev, "brcm,serial-led-msb-first")) + set_bits |= LED_CTRL_SERIAL_LED_MSB_FIRST; + if (dev_read_bool(dev, "brcm,serial-led-en-pol")) + set_bits |= LED_CTRL_SERIAL_LED_EN_POL; + if (dev_read_bool(dev, "brcm,serial-led-clk-pol")) + set_bits |= LED_CTRL_SERIAL_LED_CLK_POL; + if (dev_read_bool(dev, "brcm,serial-led-data-ppol")) + set_bits |= LED_CTRL_SERIAL_LED_DATA_PPOL; + if (dev_read_bool(dev, "brcm,led-test-mode")) + set_bits |= LED_CTRL_LED_TEST_MODE; + + clrsetbits_32(regs + LED_CTRL_REG, ~0, set_bits); + + return 0; +} + +static int bcm6858_led_wrap_bind(struct udevice *parent) { ofnode node; @@ -259,12 +267,10 @@ static const struct udevice_id bcm6858_led_ids[] = { { /* sentinel */ } }; -U_BOOT_DRIVER(bcm6858_led) = { - .name = "bcm6858-led", - .id = UCLASS_LED, +U_BOOT_DRIVER(bcm6858_led_wrap) = { + .name = "bcm6858_led_wrap", + .id = UCLASS_NOP, .of_match = bcm6858_led_ids, - .bind = bcm6858_led_bind, - .probe = bcm6858_led_probe, - .priv_auto = sizeof(struct bcm6858_led_priv), - .ops = &bcm6858_led_ops, + .probe = bcm6858_led_wrap_probe, + .bind = bcm6858_led_wrap_bind, }; From b1aade87ca1f5d3788bd6ef570b438c2dc7a9428 Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Fri, 7 Jul 2023 10:13:34 +0200 Subject: [PATCH 03/24] lib: sparse: allocate FASTBOOT_MAX_BLK_WRITE instead of small number Commit 62649165cb02 ("lib: sparse: Make CHUNK_TYPE_RAW buffer aligned") fixed cache alignment for systems with a D-CACHE. However it introduced some performance regressions [1] on system flashing huge images, such as Android. On AM62x SK EVM, we also observe such performance penalty: Sending sparse 'super' 1/2 (768793 KB) OKAY [ 23.954s] Writing 'super' OKAY [ 75.926s] Sending sparse 'super' 2/2 (629819 KB) OKAY [ 19.641s] Writing 'super' OKAY [ 62.849s] Finished. Total time: 182.474s The reason for this is that we use an arbitrary small buffer (info->blksz * 100) for transferring. Fix it by using a bigger buffer (info->blksz * FASTBOOT_MAX_BLK_WRITE) as suggested in the original's patch review [2]. With this patch, performance impact is mitigated: Sending sparse 'super' 1/2 (768793 KB) OKAY [ 23.912s] Writing 'super' OKAY [ 15.780s] Sending sparse 'super' 2/2 (629819 KB) OKAY [ 19.581s] Writing 'super' OKAY [ 17.192s] Finished. Total time: 76.569s [1] https://lore.kernel.org/r/20221118121323.4009193-1-gary.bisson@boundarydevices.com [2] https://lore.kernel.org/r/all/43e4c17c-4483-ec8e-f843-9b4c5569bd18@seco.com/ Fixes: 62649165cb02 ("lib: sparse: Make CHUNK_TYPE_RAW buffer aligned") Signed-off-by: Mattijs Korpershoek --- drivers/fastboot/fb_mmc.c | 2 -- include/image-sparse.h | 2 ++ lib/image-sparse.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 9d25c402028..060918e4910 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -19,8 +19,6 @@ #include #include -#define FASTBOOT_MAX_BLK_WRITE 16384 - #define BOOT_PARTITION_NAME "boot" struct fb_mmc_sparse { diff --git a/include/image-sparse.h b/include/image-sparse.h index 0572dbd0a28..282a0b25649 100644 --- a/include/image-sparse.h +++ b/include/image-sparse.h @@ -7,6 +7,8 @@ #include #include +#define FASTBOOT_MAX_BLK_WRITE 16384 + #define ROUNDUP(x, y) (((x) + ((y) - 1)) & ~((y) - 1)) struct sparse_storage { diff --git a/lib/image-sparse.c b/lib/image-sparse.c index 5ec0f94ab3e..8f8a67e1580 100644 --- a/lib/image-sparse.c +++ b/lib/image-sparse.c @@ -55,7 +55,8 @@ static lbaint_t write_sparse_chunk_raw(struct sparse_storage *info, void *data, char *response) { - lbaint_t n = blkcnt, write_blks, blks = 0, aligned_buf_blks = 100; + lbaint_t n = blkcnt, write_blks, blks = 0; + lbaint_t aligned_buf_blks = FASTBOOT_MAX_BLK_WRITE; uint32_t *aligned_buf = NULL; if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) { From d6c0d7087f0d17d954a39e0f6af406cfb2d7d43a Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 12 Jul 2023 11:30:44 +1200 Subject: [PATCH 04/24] drivers: rtc: max313xx: provide read8/write8 In some designs the MAX313xx RTC may need calibration to cope with oscillator inaccuracies. Provide read8/write8 ops so that the registers can be accessed. Because the driver covers a range of MAX313xx variants no attempt is made to ensure the register is valid. Signed-off-by: Chris Packham --- drivers/rtc/max313xx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/rtc/max313xx.c b/drivers/rtc/max313xx.c index 748f3c42c30..60400235dd0 100644 --- a/drivers/rtc/max313xx.c +++ b/drivers/rtc/max313xx.c @@ -326,10 +326,22 @@ static int max313xx_reset(struct udevice *dev) return ret; } +static int max313xx_read8(struct udevice *dev, unsigned int reg) +{ + return dm_i2c_reg_read(dev, reg); +} + +static int max313xx_write8(struct udevice *dev, unsigned int reg, int val) +{ + return dm_i2c_reg_write(dev, reg, val); +} + static const struct rtc_ops max3133x_rtc_ops = { .get = max313xx_read_time, .set = max313xx_set_time, .reset = max313xx_reset, + .read8 = max313xx_read8, + .write8 = max313xx_write8, }; static int max313xx_init(struct udevice *dev) From a6dd927f5b1c61e7b6afc8059378408c8c8db2c8 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 13 Jul 2023 16:35:24 +0200 Subject: [PATCH 05/24] fwu: Allow code to properly decode trial state Current code after capsule update (mtd write) is not changing active_index in mdata to previous_active_index. On the reboot this is shown but showing message "Boot idx 1 is not matching active idx 0, changing active_idx" which is changing active_idx and writing mdata to flash. But when this message is visible it is not checking which state that images are. If they have acceptance bit setup to yes everything is fine and valid images are booted (doesn't mean the latest one). But if acceptance bit is no and images are in trial state in_trial variable is never setup. Which means that from new flashed image stable image can be rewritten because in_trial is not setup properly. Signed-off-by: Michal Simek Acked-by: Jassi Brar --- lib/fwu_updates/fwu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index cd5c3b64773..38b50cb7628 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -666,8 +666,6 @@ static int fwu_boottime_checks(void *ctx, struct event *event) ret = fwu_set_active_index(boot_idx); if (!ret) boottime_check = 1; - - return 0; } if (efi_init_obj_list() != EFI_SUCCESS) From 395ab12b5f45bc5163f610f07695c73940bfae48 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 13 Jul 2023 16:36:27 +0200 Subject: [PATCH 06/24] fwu: mtd: Fix dfu_alt_info generation for 2 images per bank Code rewrites the last char of size with adding &. It is visible from dfu_alt_info print before this patch: Make dfu_alt_info: 'mtd nor0=bank0 raw 2320000 80000;bank1 raw 27a0000 8000&mtd nor0=bank0 raw 23a0000 4000000;bank1 raw 2820000 4000000' And after it: Make dfu_alt_info: 'mtd nor0=bank0 raw 2320000 80000;bank1 raw 27a0000 80000&mtd nor0=bank0 raw 23a0000 4000000;bank1 raw 2820000 4000000' Size for bank0 and bank1 must be the same because it is the same image. Signed-off-by: Michal Simek Acked-by: Jassi Brar --- lib/fwu_updates/fwu_mtd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/fwu_updates/fwu_mtd.c b/lib/fwu_updates/fwu_mtd.c index b73111ae24d..69cd3d7001f 100644 --- a/lib/fwu_updates/fwu_mtd.c +++ b/lib/fwu_updates/fwu_mtd.c @@ -175,8 +175,10 @@ int fwu_gen_alt_info_from_mtd(char *buf, size_t len, struct mtd_info *mtd) l = strlen(buf); /* Replace the last ';' with '&' if there is another image. */ - if (i != CONFIG_FWU_NUM_IMAGES_PER_BANK - 1 && l) - buf[l - 1] = '&'; + if (i != CONFIG_FWU_NUM_IMAGES_PER_BANK - 1 && l) { + buf[l] = '&'; + buf++; + } len -= l; buf += l; } From b378fdd1ff13bd6df9814a237e741fe2e9bdf7cb Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 14 Jul 2023 10:47:06 +0200 Subject: [PATCH 07/24] fwu: Show number of attempts in Trial State It is not visible anywhere in Trial State if this is the first, second, etc attempt that's why show a message to be aware about status. Signed-off-by: Michal Simek Acked-by: Jassi Brar --- lib/fwu_updates/fwu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index 38b50cb7628..4d0c8b84b9d 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -95,6 +95,8 @@ static int fwu_trial_count_update(void) log_err("Unable to revert active_index\n"); ret = 1; } else { + log_info("Trial State count: attempt %d out of %d\n", + trial_state_ctr, CONFIG_FWU_TRIAL_STATE_CNT); ret = trial_counter_update(&trial_state_ctr); if (ret) log_err("Unable to increment TrialStateCtr variable\n"); From 17335a81c58f87884aadb77271a28ffdaa140851 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 15 Jul 2023 09:16:59 +0200 Subject: [PATCH 08/24] common: define time_t as 64bit To avoid the year 2038 problem time_t must be 64bit on all architectures. Signed-off-by: Heinrich Schuchardt --- include/linux/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/types.h b/include/linux/types.h index baa2c491ea5..9df930afd13 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -65,7 +65,7 @@ typedef __kernel_ptrdiff_t ptrdiff_t; #ifndef _TIME_T #define _TIME_T -typedef __kernel_time_t time_t; +typedef long long time_t; #endif #ifndef _CLOCK_T From d45f6c13f54919c040601132f3a569d053ece8cc Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 15 Jul 2023 11:02:24 -0400 Subject: [PATCH 09/24] .mailmap: Correct entries for Masahiro Yamada His entries had the correct email address listed last rather than first, correct this. Fixes: 4fa4227cdd14 (".mailmap: Record all address for main U-Boot contributor") Signed-off-by: Tom Rini Acked-by: Michal Simek --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 312a428dc9f..05cb310e416 100644 --- a/.mailmap +++ b/.mailmap @@ -65,8 +65,8 @@ Marek Vasut Marek Vasut Marek Vasut Markus Klotzbuecher -Masahiro Yamada -Masahiro Yamada +Masahiro Yamada +Masahiro Yamada Michal Simek Michal Simek Michal Simek From 8faeb1d7220efff3020d7e050d2a1768a3f426f4 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 16 Jul 2023 13:34:44 +0200 Subject: [PATCH 10/24] part: eliminate part_get_info_by_name_type() Since commit 56670d6fb83f ("disk: part: use common api to lookup part driver") part_get_info_by_name_type() ignores the part_type parameter used to restrict the partition table type. omap_mmc_get_part_size() and part_get_info_by_name() are the only consumers. omap_mmc_get_part_size() calls with part_type = PART_TYPE_EFI because at the time of implementation a speed up could be gained by passing the partition table type. After 5 years experience without this restriction it looks safe to keep it that way. part_get_info_by_name() uses PART_TYPE_ALL. Move the logic of part_get_info_by_name_type() to part_get_info_by_name() and replace the function in omap_mmc_get_part_size(). Fixes: 56670d6fb83f ("disk: part: use common api to lookup part driver") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- arch/arm/mach-omap2/utils.c | 3 +-- disk/part.c | 10 ++-------- include/part.h | 23 ----------------------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 6e6791fc659..7d938724f84 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -100,8 +100,7 @@ static u32 omap_mmc_get_part_size(const char *part) return 0; } - /* Check only for EFI (GPT) partition table */ - res = part_get_info_by_name_type(dev_desc, part, &info, PART_TYPE_EFI); + res = part_get_info_by_name(dev_desc, part, &info); if (res < 0) return 0; diff --git a/disk/part.c b/disk/part.c index 0a03b8213d8..186ee965006 100644 --- a/disk/part.c +++ b/disk/part.c @@ -670,8 +670,8 @@ cleanup: return ret; } -int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, - struct disk_partition *info, int part_type) +int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, + struct disk_partition *info) { struct part_driver *part_drv; int ret; @@ -702,12 +702,6 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, return -ENOENT; } -int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, - struct disk_partition *info) -{ - return part_get_info_by_name_type(dev_desc, name, info, PART_TYPE_ALL); -} - /** * Get partition info from device number and partition name. * diff --git a/include/part.h b/include/part.h index b19b33ab89a..edc46f8dcbe 100644 --- a/include/part.h +++ b/include/part.h @@ -201,21 +201,6 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, struct blk_desc **dev_desc, struct disk_partition *info, int allow_whole_dev); -/** - * part_get_info_by_name_type() - Search for a partition by name - * for only specified partition type - * - * @param dev_desc - block device descriptor - * @param gpt_name - the specified table entry name - * @param info - returns the disk partition info - * @param part_type - only search in partitions of this type - * - * Return: - the partition number on match (starting on 1), -1 on no match, - * otherwise error - */ -int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, - struct disk_partition *info, int part_type); - /** * part_get_info_by_name() - Search for a partition by name * among all available registered partitions @@ -293,14 +278,6 @@ static inline int blk_get_device_part_str(const char *ifname, int allow_whole_dev) { *dev_desc = NULL; return -1; } -static inline int part_get_info_by_name_type(struct blk_desc *dev_desc, - const char *name, - struct disk_partition *info, - int part_type) -{ - return -ENOENT; -} - static inline int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, struct disk_partition *info) From aaf929a55fbb054d3184a763b1d0a501342c715e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 12:20:24 -0400 Subject: [PATCH 11/24] MAINTAINERS: Correct minor mistakes on some file listings There are a few entries where minor mistakes mean that we don't match up with obviously expected files, correct those. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/amlogic/u200/MAINTAINERS | 2 +- board/broadcom/bcmns/MAINTAINERS | 2 +- board/freescale/imx93_evk/MAINTAINERS | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS index f429c212ba3..88c5038d944 100644 --- a/board/amlogic/u200/MAINTAINERS +++ b/board/amlogic/u200/MAINTAINERS @@ -4,7 +4,7 @@ S: Maintained L: u-boot-amlogic@groups.io F: board/amlogic/u200/ F: configs/u200_defconfig -F: configs/bananapi-m2pro_defconfig +F: configs/bananapi-m2-pro_defconfig F: configs/bananapi-m5_defconfig F: configs/radxa-zero_defconfig F: doc/board/amlogic/u200.rst diff --git a/board/broadcom/bcmns/MAINTAINERS b/board/broadcom/bcmns/MAINTAINERS index fd37c334a5b..86b68c989cd 100644 --- a/board/broadcom/bcmns/MAINTAINERS +++ b/board/broadcom/bcmns/MAINTAINERS @@ -2,5 +2,5 @@ BCMNS BOARD M: Linus Walleij S: Maintained F: board/broadcom/bcmnsp/ -F: configs/bcmnsp_defconfig +F: configs/bcmns_defconfig F: include/configs/bcmnsp.h diff --git a/board/freescale/imx93_evk/MAINTAINERS b/board/freescale/imx93_evk/MAINTAINERS index 8ca4646f20f..34ba278fcdf 100644 --- a/board/freescale/imx93_evk/MAINTAINERS +++ b/board/freescale/imx93_evk/MAINTAINERS @@ -4,4 +4,4 @@ S: Maintained F: board/freescale/imx93_evk/ F: include/configs/imx93_evk.h F: configs/imx93_11x11_evk_defconfig - configs/imx93_11x11_evk_ld_defconfig +F: configs/imx93_11x11_evk_ld_defconfig From e5478bef263ff5255ee4a81a47b1fd58dc6cb44b Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 12:20:25 -0400 Subject: [PATCH 12/24] MAINTAINERS: Add some missing defconfig files to existing entries We have a few places where defconfigs were added (or renamed) and not included in their previously listed MAINTAINERS entry, correct this. Signed-off-by: Tom Rini Acked-by: Adam Ford Reviewed-by: Simon Glass --- board/Marvell/db-88f6820-amc/MAINTAINERS | 1 + board/amlogic/w400/MAINTAINERS | 1 + board/beacon/imx8mm/MAINTAINERS | 1 + board/beacon/imx8mn/MAINTAINERS | 1 + board/siemens/iot2050/MAINTAINERS | 3 ++- board/solidrun/clearfog/MAINTAINERS | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/board/Marvell/db-88f6820-amc/MAINTAINERS b/board/Marvell/db-88f6820-amc/MAINTAINERS index abf5b7efdc9..d519eb47b84 100644 --- a/board/Marvell/db-88f6820-amc/MAINTAINERS +++ b/board/Marvell/db-88f6820-amc/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/Marvell/db-88f6820-amc/ F: include/configs/db-88f6820-amc.h F: configs/db-88f6820-amc_defconfig +F: configs/db-88f6820-amc_nand_defconfig diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS index 117f79ea047..19b1f30e621 100644 --- a/board/amlogic/w400/MAINTAINERS +++ b/board/amlogic/w400/MAINTAINERS @@ -5,6 +5,7 @@ L: u-boot-amlogic@groups.io F: board/amlogic/w400/ F: configs/bananapi-cm4-cm4io_defconfig F: configs/bananapi-m2s_defconfig +F: configs/odroid-n2l_defconfig F: configs/radxa-zero2_defconfig F: doc/board/amlogic/w400.rst F: doc/board/amlogic/bananapi-cm4io.rst diff --git a/board/beacon/imx8mm/MAINTAINERS b/board/beacon/imx8mm/MAINTAINERS index d48ba8605bb..d8a5d097369 100644 --- a/board/beacon/imx8mm/MAINTAINERS +++ b/board/beacon/imx8mm/MAINTAINERS @@ -5,4 +5,5 @@ S: Maintained F: board/beacon/imx8mm/ F: include/configs/imx8mm_beacon.h F: configs/imx8mm_beacon_defconfig +F: configs/imx8mm_beacon_fspi_defconfig F: doc/board/beacon/ diff --git a/board/beacon/imx8mn/MAINTAINERS b/board/beacon/imx8mn/MAINTAINERS index 4805cb255cc..6dcef21a65e 100644 --- a/board/beacon/imx8mn/MAINTAINERS +++ b/board/beacon/imx8mn/MAINTAINERS @@ -5,3 +5,4 @@ F: board/beacon/imx8mn/ F: include/configs/imx8mn_beacon.h F: configs/imx8mn_beacon_defconfig F: configs/imx8mn_beacon_2g_defconfig +F: configs/imx8mn_beacon_fspi_defconfig diff --git a/board/siemens/iot2050/MAINTAINERS b/board/siemens/iot2050/MAINTAINERS index 1b525356c2d..aa21de2099f 100644 --- a/board/siemens/iot2050/MAINTAINERS +++ b/board/siemens/iot2050/MAINTAINERS @@ -4,6 +4,7 @@ M: Jan Kiszka S: Maintained F: board/siemens/iot2050/ F: include/configs/iot2050.h -F: configs/iot2050_defconfig +F: configs/iot2050_pg1_defconfig +F: configs/iot2050_pg2_defconfig F: arch/arm/dts/iot2050-* F: doc/board/siemens/iot2050.rst diff --git a/board/solidrun/clearfog/MAINTAINERS b/board/solidrun/clearfog/MAINTAINERS index 6646d96206b..55bd1278049 100644 --- a/board/solidrun/clearfog/MAINTAINERS +++ b/board/solidrun/clearfog/MAINTAINERS @@ -5,3 +5,5 @@ F: board/soldrun/clearfog/ F: include/configs/clearfog.h F: configs/clearfog_defconfig F: configs/clearfog_gt_8k_defconfig +F: configs/clearfog_sata_defconfig +F: configs/clearfog_spi_defconfig From 2b506407c8ca04549398e69e0de8d59062ca9159 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 12:20:26 -0400 Subject: [PATCH 13/24] rockchip: Add MAINTAINERS entry for Radxa Rock 4C+ This defconfig was added without a MAINTAINERS entry, add one. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/rockchip/evb_rk3399/MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index 5be58f80f9b..de1dc64a962 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -80,6 +80,12 @@ F: configs/orangepi-rk3399_defconfig F: arch/arm/dts/rk3399-u-boot.dtsi F: arch/arm/dts/rk3399-orangepi-u-boot.dtsi +RADXA ROCK 4C+ +M: FUKAUMI Naoki +S: Maintained +F: configs/rock-4c-plus-rk3399_defconfig +F: arch/arm/dts/rk3399-rock-4c-plus.dts + ROCK-PI-4 M: Akash Gajjar M: Jagan Teki From d38ed5b68cfbd6bfae2f35aa36855b41d71f2e87 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 12:20:27 -0400 Subject: [PATCH 14/24] sunxi: Add MAINTAINERS entry for Lctech Pi F1C200s This defconfig was added without a MAINTAINERS entry, add one. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/sunxi/MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 80e3f4be4b9..98bbd2dd25d 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -211,6 +211,11 @@ M: Aleksandr Aleksandrov S: Maintained F: configs/emlid_neutis_n5_devboard_defconfig +LCTECH PI F1C200S +M: Andre Przywara +S: Maintained +F: configs/lctech_pi_f1c200s_defconfig + GEMEI-G9 TABLET M: Priit Laes S: Maintained From 5005dfbfdf84ac83115eada645edf17e9a6ce8f8 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 12:20:28 -0400 Subject: [PATCH 15/24] MAINTAINERS: Re-order CAAM section This file is in alphabetical order, move CAAM up to where it should be. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- MAINTAINERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 87991cccddb..697190558ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -840,6 +840,13 @@ M: Simon Glass S: Maintained F: tools/buildman/ +CAAM +M: Gaurav Jain +S: Maintained +F: arch/arm/dts/ls1021a-twr-u-boot.dtsi +F: drivers/crypto/fsl/ +F: include/fsl_sec.h + CAT M: Roger Knecht S: Maintained @@ -1627,10 +1634,3 @@ T: git https://source.denx.de/u-boot/u-boot.git F: configs/tools-only_defconfig F: * F: */ - -CAAM -M: Gaurav Jain -S: Maintained -F: arch/arm/dts/ls1021a-twr-u-boot.dtsi -F: drivers/crypto/fsl/ -F: include/fsl_sec.h From 1f2e4027faf2fb62cfcc32596cbc17762b00932e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:28 -0400 Subject: [PATCH 16/24] arm: Remove more remnants of bcmcygnus Remove some leftover files from the bcmcygnus platform. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- arch/arm/Kconfig | 15 +----- board/broadcom/bcm_ep/Makefile | 5 -- board/broadcom/bcm_ep/board.c | 86 ---------------------------------- 3 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 board/broadcom/bcm_ep/Makefile delete mode 100644 board/broadcom/bcm_ep/board.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bdd535fd73f..97c25b4f146 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -357,7 +357,7 @@ config SYS_ARM_ARCH choice prompt "Select the ARM data write cache policy" - default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || TARGET_BCMNS || RZA1 + default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMNS || RZA1 default SYS_ARM_CACHE_WRITEBACK config SYS_ARM_CACHE_WRITEBACK @@ -668,19 +668,6 @@ config TARGET_VEXPRESS_CA9X4 select CPU_V7A select PL011_SERIAL -config TARGET_BCMCYGNUS - bool "Support bcmcygnus" - select CPU_V7A - select GPIO_EXTRA_HEADER - select IPROC - imply BCM_SF2_ETH - imply BCM_SF2_ETH_GMAC - imply CMD_HASH - imply CRC32_VERIFY - imply FAT_WRITE - imply HASH_VERIFY - imply NETDEVICES - config TARGET_BCMNS bool "Support Broadcom Northstar" select CPU_V7A diff --git a/board/broadcom/bcm_ep/Makefile b/board/broadcom/bcm_ep/Makefile deleted file mode 100644 index 29a3ea7eda1..00000000000 --- a/board/broadcom/bcm_ep/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright 2014 Broadcom Corporation. - -obj-y += board.o diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c deleted file mode 100644 index e91fa40e640..00000000000 --- a/board/broadcom/bcm_ep/board.c +++ /dev/null @@ -1,86 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2014 Broadcom Corporation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -/* - * board_init - early hardware init - */ -int board_init(void) -{ - /* - * Address of boot parameters passed to kernel - * Use default offset 0x100 - */ - gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100; - - return 0; -} - -/* - * dram_init - sets u-boot's idea of sdram size - */ -int dram_init(void) -{ - gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE, - CFG_SYS_SDRAM_SIZE); - return 0; -} - -int dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE; - gd->bd->bi_dram[0].size = gd->ram_size; - - return 0; -} - -int board_early_init_f(void) -{ - uint32_t status = 0; - - /* Setup PLL if required */ -#if defined(CONFIG_ARMCLK) - armpll_config(CONFIG_ARMCLK); -#endif - - return status; -} - -#ifdef CONFIG_ARMV7_NONSEC -void smp_set_core_boot_addr(unsigned long addr, int corenr) -{ -} - -void smp_kick_all_cpus(void) -{ -} - -void smp_waitloop(unsigned previous_address) -{ -} -#endif - -#ifdef CONFIG_BCM_SF2_ETH -int board_eth_init(struct bd_info *bis) -{ - int rc = -1; - printf("Registering BCM sf2 eth\n"); - rc = bcm_sf2_eth_register(bis, 0); - return rc; -} -#endif From 4835e86cba35a3a582ec1c56338dc0bdb155d13a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:29 -0400 Subject: [PATCH 17/24] arm: Remove leftover MAINTAINERS files These platforms have been removed, but the MAINTAINERS file was missed, clean up. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/birdland/bav335x/MAINTAINERS | 13 ------------- board/broadcom/bcm11130/MAINTAINERS | 6 ------ board/broadcom/bcm11130_nand/MAINTAINERS | 6 ------ board/broadcom/bcm28155_w1d/MAINTAINERS | 6 ------ 4 files changed, 31 deletions(-) delete mode 100644 board/birdland/bav335x/MAINTAINERS delete mode 100644 board/broadcom/bcm11130/MAINTAINERS delete mode 100644 board/broadcom/bcm11130_nand/MAINTAINERS delete mode 100644 board/broadcom/bcm28155_w1d/MAINTAINERS diff --git a/board/birdland/bav335x/MAINTAINERS b/board/birdland/bav335x/MAINTAINERS deleted file mode 100644 index 45dcfcb1e6e..00000000000 --- a/board/birdland/bav335x/MAINTAINERS +++ /dev/null @@ -1,13 +0,0 @@ -BAV335x BOARD -M: Gilles Gameiro -S: Maintained -F: include/configs/bav335x.h -F: board/birdland/bav335x/Kconfig -F: board/birdland/bav335x/Makefile -F: board/birdland/bav335x/README -F: board/birdland/bav335x/board.c -F: board/birdland/bav335x/board.h -F: board/birdland/bav335x/mux.c -F: board/birdland/bav335x/u-boot.lds -F: configs/birdland_bav335a_defconfig -F: configs/birdland_bav335b_defconfig diff --git a/board/broadcom/bcm11130/MAINTAINERS b/board/broadcom/bcm11130/MAINTAINERS deleted file mode 100644 index 54783501e6d..00000000000 --- a/board/broadcom/bcm11130/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM11130 BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcm28155_ap/ -F: include/configs/bcm_ep_board.h -F: configs/bcm11130_defconfig diff --git a/board/broadcom/bcm11130_nand/MAINTAINERS b/board/broadcom/bcm11130_nand/MAINTAINERS deleted file mode 100644 index 4cf66b7e4a6..00000000000 --- a/board/broadcom/bcm11130_nand/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM11130_NAND BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcm28155_ap/ -F: include/configs/bcm_ep_board.h -F: configs/bcm11130_nand_defconfig diff --git a/board/broadcom/bcm28155_w1d/MAINTAINERS b/board/broadcom/bcm28155_w1d/MAINTAINERS deleted file mode 100644 index c0558e7f255..00000000000 --- a/board/broadcom/bcm28155_w1d/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM28155_W1D BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcm28155_ap/ -F: include/configs/bcm28155_ap.h -F: configs/bcm28155_w1d_defconfig From bded724104b36481ac52cd1814139722206f6a9d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:30 -0400 Subject: [PATCH 18/24] xes: Remove leftover code The platforms here have been removed, but the common code directory was forgotten. Clean up. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/xes/common/Makefile | 9 ----- board/xes/common/board.c | 67 -------------------------------- board/xes/common/fsl_8xxx_clk.c | 54 ------------------------- board/xes/common/fsl_8xxx_misc.c | 43 -------------------- board/xes/common/fsl_8xxx_misc.h | 11 ------ 5 files changed, 184 deletions(-) delete mode 100644 board/xes/common/Makefile delete mode 100644 board/xes/common/board.c delete mode 100644 board/xes/common/fsl_8xxx_clk.c delete mode 100644 board/xes/common/fsl_8xxx_misc.c delete mode 100644 board/xes/common/fsl_8xxx_misc.h diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile deleted file mode 100644 index b00accca1be..00000000000 --- a/board/xes/common/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. - -obj-$(CONFIG_MPC86xx) += fsl_8xxx_clk.o -obj-$(CONFIG_ARCH_P2020) += fsl_8xxx_clk.o -obj-$(CONFIG_MPC85xx) += fsl_8xxx_misc.o board.o -obj-$(CONFIG_MPC86xx) += fsl_8xxx_misc.o board.o diff --git a/board/xes/common/board.c b/board/xes/common/board.c deleted file mode 100644 index 053b07a0b70..00000000000 --- a/board/xes/common/board.c +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2009 Extreme Engineering Solutions, Inc. - */ - -#include -#include -#include "fsl_8xxx_misc.h" -#include - -int checkboard(void) -{ - char name[] = CONFIG_SYS_BOARD_NAME; - char buf[64]; - char *s; - int i; - -#ifdef CONFIG_SYS_FORM_CUSTOM - s = "Custom"; -#elif CONFIG_SYS_FORM_6U_CPCI - s = "6U CompactPCI"; -#elif CONFIG_SYS_FORM_ATCA_PMC - s = "ATCA w/PMC"; -#elif CONFIG_SYS_FORM_ATCA_AMC - s = "ATCA w/AMC"; -#elif CONFIG_SYS_FORM_VME - s = "VME"; -#elif CONFIG_SYS_FORM_6U_VPX - s = "6U VPX"; -#elif CONFIG_SYS_FORM_PMC - s = "PMC"; -#elif CONFIG_SYS_FORM_PCI - s = "PCI"; -#elif CONFIG_SYS_FORM_3U_CPCI - s = "3U CompactPCI"; -#elif CONFIG_SYS_FORM_AMC - s = "AdvancedMC"; -#elif CONFIG_SYS_FORM_XMC - s = "XMC"; -#elif CONFIG_SYS_FORM_PMC_XMC - s = "PMC/XMC"; -#elif CONFIG_SYS_FORM_PCI_EXPRESS - s = "PCI Express"; -#elif CONFIG_SYS_FORM_3U_VPX - s = "3U VPX"; -#else -#error "Form factor not defined" -#endif - - name[strlen(name) - 1] += get_board_derivative(); - printf("Board: X-ES %s %s SBC\n", name, s); - - /* Display board specific information */ - puts(" "); - i = env_get_f("board_rev", buf, sizeof(buf)); - if (i > 0) - printf("Rev %s, ", buf); - i = env_get_f("serial#", buf, sizeof(buf)); - if (i > 0) - printf("Serial# %s, ", buf); - i = env_get_f("board_cfg", buf, sizeof(buf)); - if (i > 0) - printf("Cfg %s", buf); - puts("\n"); - - return 0; -} diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c deleted file mode 100644 index c36b2afd50e..00000000000 --- a/board/xes/common/fsl_8xxx_clk.c +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#include -#include -#include - -/* - * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config - */ -unsigned long get_board_sys_clk(void) -{ -#if defined(CONFIG_MPC85xx) - volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); -#elif defined(CONFIG_MPC86xx) - immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; - volatile ccsr_gur_t *gur = &immap->im_gur; -#endif - - if (in_be32(&gur->gpporcr) & 0x10000) - return 66666666; - else -#ifdef CONFIG_ARCH_P2020 - return 100000000; -#else - return 50000000; -#endif -} - -#ifdef CONFIG_MPC85xx -/* - * Return DDR input clock - synchronous with SYSCLK or 66 MHz - * Note: 86xx doesn't support asynchronous DDR clk - */ -unsigned long get_board_ddr_clk(void) -{ - volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); - u32 ddr_ratio = (in_be32(&gur->porpllsr) & 0x00003e00) >> 9; - - if (ddr_ratio == 0x7) - return get_board_sys_clk(); - -#ifdef CONFIG_ARCH_P2020 - if (in_be32(&gur->gpporcr) & 0x20000) - return 66666666; - else - return 100000000; -#else - return 66666666; -#endif -} -#endif diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c deleted file mode 100644 index bc7e5c5764f..00000000000 --- a/board/xes/common/fsl_8xxx_misc.c +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#include -#include -#ifdef CONFIG_PCA953X -#include - -/* - * Determine if a board's flashes are write protected - */ -int board_flash_wp_on(void) -{ - if (pca953x_get_val(CFG_SYS_I2C_PCA953X_ADDR0) & - CONFIG_SYS_PCA953X_NVM_WP) - return 1; - - return 0; -} -#endif - -/* - * Return a board's derivative model number. For example: - * return 2 for the XPedite5372 and return 1 for the XPedite5201. - */ -uint get_board_derivative(void) -{ -#if defined(CONFIG_MPC85xx) - volatile ccsr_gur_t *gur = (void *)CFG_SYS_MPC85xx_GUTS_ADDR; -#elif defined(CONFIG_MPC86xx) - volatile immap_t *immap = (immap_t *)CFG_SYS_CCSRBAR; - volatile ccsr_gur_t *gur = &immap->im_gur; -#endif - - /* - * The top 4 lines of the local bus address are pulled low/high and - * can be read to determine the least significant digit of a board's - * model number. - */ - return gur->gpporcr >> 28; -} diff --git a/board/xes/common/fsl_8xxx_misc.h b/board/xes/common/fsl_8xxx_misc.h deleted file mode 100644 index 6e4858f15c3..00000000000 --- a/board/xes/common/fsl_8xxx_misc.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#ifndef __FSL_8XXX_MISC_H___ -#define __FSL_8XXX_MISC_H___ - -uint get_board_derivative(void); - -#endif /* __FSL_8XXX_MISC_H__ */ From f23f1b53077b0642209769ef5fd77d5ffb93f2bd Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:31 -0400 Subject: [PATCH 19/24] MAINTAINERS: Add a number of "common" directories A number of platforms have "common" directories that are in turn not listed by the board MAINTAINERS file. Add these directories in many cases. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- MAINTAINERS | 1 + board/BuR/brppt1/MAINTAINERS | 1 + board/BuR/brppt2/MAINTAINERS | 1 + board/BuR/brsmarc1/MAINTAINERS | 1 + board/BuR/brxre1/MAINTAINERS | 1 + board/LaCie/net2big_v2/MAINTAINERS | 1 + board/LaCie/netspace_v2/MAINTAINERS | 1 + board/Synology/ds109/MAINTAINERS | 1 + board/Synology/ds116/MAINTAINERS | 1 + board/Synology/ds414/MAINTAINERS | 1 + board/avionic-design/medcom-wide/MAINTAINERS | 1 + board/avionic-design/plutux/MAINTAINERS | 1 + board/avionic-design/tec-ng/MAINTAINERS | 1 + board/avionic-design/tec/MAINTAINERS | 1 + board/emulation/qemu-arm/MAINTAINERS | 1 + board/emulation/qemu-ppce500/MAINTAINERS | 1 + board/emulation/qemu-riscv/MAINTAINERS | 1 + board/emulation/qemu-x86/MAINTAINERS | 2 ++ board/engicam/imx6q/MAINTAINERS | 1 + board/engicam/imx6ul/MAINTAINERS | 1 + board/engicam/imx8mm/MAINTAINERS | 1 + board/engicam/imx8mp/MAINTAINERS | 1 + board/engicam/px30_core/MAINTAINERS | 1 + board/engicam/stm32mp1/MAINTAINERS | 1 + board/gdsys/a38x/MAINTAINERS | 1 + board/gdsys/mpc8308/MAINTAINERS | 1 + board/keymile/km83xx/MAINTAINERS | 2 ++ board/keymile/kmcent2/MAINTAINERS | 2 ++ board/keymile/pg-wcom-ls102xa/MAINTAINERS | 2 ++ board/keymile/secu1/MAINTAINERS | 2 ++ board/toradex/apalis-imx8/MAINTAINERS | 1 + board/toradex/apalis-tk1/MAINTAINERS | 1 + board/toradex/apalis_imx6/MAINTAINERS | 1 + board/toradex/apalis_t30/MAINTAINERS | 1 + board/toradex/colibri-imx6ull/MAINTAINERS | 1 + board/toradex/colibri-imx8x/MAINTAINERS | 1 + board/toradex/colibri_imx6/MAINTAINERS | 1 + board/toradex/colibri_imx7/MAINTAINERS | 1 + board/toradex/colibri_t20/MAINTAINERS | 1 + board/toradex/colibri_t30/MAINTAINERS | 1 + board/toradex/colibri_vf/MAINTAINERS | 1 + board/toradex/verdin-imx8mm/MAINTAINERS | 1 + board/toradex/verdin-imx8mp/MAINTAINERS | 1 + 43 files changed, 48 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 697190558ef..89e37381398 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -282,6 +282,7 @@ F: arch/arm/include/asm/arch-mx*/ F: arch/arm/include/asm/arch-vf610/ F: arch/arm/include/asm/mach-imx/ F: board/freescale/*mx*/ +F: board/freescale/common/ F: drivers/serial/serial_mxc.c ARM HISILICON diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS index 6b45508f0f0..a974a97c157 100644 --- a/board/BuR/brppt1/MAINTAINERS +++ b/board/BuR/brppt1/MAINTAINERS @@ -2,6 +2,7 @@ BRPPT1 BOARD M: Wolfgang Wallner S: Maintained F: board/BuR/brppt1/ +F: board/BuR/common/ F: include/configs/brppt1.h F: configs/brppt1_mmc_defconfig F: configs/brppt1_nand_defconfig diff --git a/board/BuR/brppt2/MAINTAINERS b/board/BuR/brppt2/MAINTAINERS index fe65188f3d8..bfeaa571a82 100644 --- a/board/BuR/brppt2/MAINTAINERS +++ b/board/BuR/brppt2/MAINTAINERS @@ -2,5 +2,6 @@ BUR_PPT2 BOARD M: Wolfgang Wallner S: Maintained F: board/BuR/brppt2/ +F: board/BuR/common/ F: include/configs/brppt2.h F: configs/brppt2_defconfig diff --git a/board/BuR/brsmarc1/MAINTAINERS b/board/BuR/brsmarc1/MAINTAINERS index 8d1fe216a44..7421f61fc43 100644 --- a/board/BuR/brsmarc1/MAINTAINERS +++ b/board/BuR/brsmarc1/MAINTAINERS @@ -2,5 +2,6 @@ BRSMARC1 BOARD M: Wolfgang Wallner S: Maintained F: board/BuR/brsmarc1/ +F: board/BuR/common/ F: include/configs/brsmarc1.h F: configs/brsmarc1_defconfig diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS index 5aa36713d4e..f826a44b6ac 100644 --- a/board/BuR/brxre1/MAINTAINERS +++ b/board/BuR/brxre1/MAINTAINERS @@ -2,6 +2,7 @@ BRXRE1 BOARD M: Wolfgang Wallner S: Maintained F: board/BuR/brxre1/ +F: board/BuR/common/ F: include/configs/brxre1.h F: configs/brxre1_defconfig F: arch/arm/dts/am335x-brxre1.dts diff --git a/board/LaCie/net2big_v2/MAINTAINERS b/board/LaCie/net2big_v2/MAINTAINERS index 7046e1b2c5c..66e82196794 100644 --- a/board/LaCie/net2big_v2/MAINTAINERS +++ b/board/LaCie/net2big_v2/MAINTAINERS @@ -7,6 +7,7 @@ F: arch/arm/dts/kirkwood-d2net.dtsi F: arch/arm/dts/kirkwood-net2big.dts F: arch/arm/dts/kirkwood-net2big-u-boot.dtsi F: arch/arm/dts/kirkwood-netxbig.dtsi +F: board/LaCie/common/ F: board/LaCie/net2big_v2/ F: include/configs/lacie_kw.h F: configs/d2net_v2_defconfig diff --git a/board/LaCie/netspace_v2/MAINTAINERS b/board/LaCie/netspace_v2/MAINTAINERS index 1cc4f7108b6..03bc7874c16 100644 --- a/board/LaCie/netspace_v2/MAINTAINERS +++ b/board/LaCie/netspace_v2/MAINTAINERS @@ -12,6 +12,7 @@ F: arch/arm/dts/kirkwood-ns2max-u-boot.dtsi F: arch/arm/dts/kirkwood-ns2mini.dts F: arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi F: arch/arm/dts/kirkwood-ns2-u-boot.dtsi +F: board/LaCie/common/ F: board/LaCie/netspace_v2/ F: include/configs/lacie_kw.h F: configs/inetspace_v2_defconfig diff --git a/board/Synology/ds109/MAINTAINERS b/board/Synology/ds109/MAINTAINERS index 8783fdb1f20..2c50edc67de 100644 --- a/board/Synology/ds109/MAINTAINERS +++ b/board/Synology/ds109/MAINTAINERS @@ -2,5 +2,6 @@ DS109 BOARD M: Walter Schweizer S: Maintained F: board/Synology/ds109 +F: board/Synology/common F: configs/ds109_defconfig F: include/configs/ds109.h diff --git a/board/Synology/ds116/MAINTAINERS b/board/Synology/ds116/MAINTAINERS index a5080b0d148..8d3cc24fbef 100644 --- a/board/Synology/ds116/MAINTAINERS +++ b/board/Synology/ds116/MAINTAINERS @@ -3,5 +3,6 @@ M: Tony Dinh S: Maintained F: arch/arm/dts/armada-385-synology-ds116.dts F: board/Synology/ds116/ +F: board/Synology/common F: include/configs/ds116.h F: configs/ds116_defconfig diff --git a/board/Synology/ds414/MAINTAINERS b/board/Synology/ds414/MAINTAINERS index 502cbd7758d..22b75357343 100644 --- a/board/Synology/ds414/MAINTAINERS +++ b/board/Synology/ds414/MAINTAINERS @@ -2,5 +2,6 @@ DS414 BOARD M: Phil Sutter S: Maintained F: board/Synology/ds414/ +F: board/Synology/common/ F: include/configs/ds414.h F: configs/ds414_defconfig diff --git a/board/avionic-design/medcom-wide/MAINTAINERS b/board/avionic-design/medcom-wide/MAINTAINERS index 0a00fcf719e..3d2cdeca725 100644 --- a/board/avionic-design/medcom-wide/MAINTAINERS +++ b/board/avionic-design/medcom-wide/MAINTAINERS @@ -2,5 +2,6 @@ MEDCOM-WIDE BOARD M: Alban Bedel S: Maintained F: board/avionic-design/medcom-wide/ +F: board/avionic-design/common/ F: include/configs/medcom-wide.h F: configs/medcom-wide_defconfig diff --git a/board/avionic-design/plutux/MAINTAINERS b/board/avionic-design/plutux/MAINTAINERS index e8ef5096e56..0275680d21f 100644 --- a/board/avionic-design/plutux/MAINTAINERS +++ b/board/avionic-design/plutux/MAINTAINERS @@ -2,5 +2,6 @@ PLUTUX BOARD M: Alban Bedel S: Maintained F: board/avionic-design/plutux/ +F: board/avionic-design/common/ F: include/configs/plutux.h F: configs/plutux_defconfig diff --git a/board/avionic-design/tec-ng/MAINTAINERS b/board/avionic-design/tec-ng/MAINTAINERS index 5cbdf8e7ebf..645be8186aa 100644 --- a/board/avionic-design/tec-ng/MAINTAINERS +++ b/board/avionic-design/tec-ng/MAINTAINERS @@ -2,5 +2,6 @@ TEC-NG BOARD M: Alban Bedel S: Maintained F: board/avionic-design/tec-ng/ +F: board/avionic-design/common/ F: include/configs/tec-ng.h F: configs/tec-ng_defconfig diff --git a/board/avionic-design/tec/MAINTAINERS b/board/avionic-design/tec/MAINTAINERS index 10f1aac7a63..36088e7dacc 100644 --- a/board/avionic-design/tec/MAINTAINERS +++ b/board/avionic-design/tec/MAINTAINERS @@ -2,5 +2,6 @@ TEC BOARD M: Alban Bedel S: Maintained F: board/avionic-design/tec/ +F: board/avionic-design/common/ F: include/configs/tec.h F: configs/tec_defconfig diff --git a/board/emulation/qemu-arm/MAINTAINERS b/board/emulation/qemu-arm/MAINTAINERS index e757ffc64f1..5154262f29e 100644 --- a/board/emulation/qemu-arm/MAINTAINERS +++ b/board/emulation/qemu-arm/MAINTAINERS @@ -2,6 +2,7 @@ QEMU ARM 'VIRT' BOARD M: Tuomas Tynkkynen S: Maintained F: board/emulation/qemu-arm/ +F: board/emulation/common/ F: include/configs/qemu-arm.h F: configs/qemu_arm_defconfig F: configs/qemu_arm64_defconfig diff --git a/board/emulation/qemu-ppce500/MAINTAINERS b/board/emulation/qemu-ppce500/MAINTAINERS index 7317983d6a6..348ae9085f4 100644 --- a/board/emulation/qemu-ppce500/MAINTAINERS +++ b/board/emulation/qemu-ppce500/MAINTAINERS @@ -3,5 +3,6 @@ M: Alexander Graf M: Bin Meng S: Maintained F: board/emulation/qemu-ppce500/ +F: board/emulation/common/ F: include/configs/qemu-ppce500.h F: configs/qemu-ppce500_defconfig diff --git a/board/emulation/qemu-riscv/MAINTAINERS b/board/emulation/qemu-riscv/MAINTAINERS index 78969ed6bd8..3d7453f1b43 100644 --- a/board/emulation/qemu-riscv/MAINTAINERS +++ b/board/emulation/qemu-riscv/MAINTAINERS @@ -2,6 +2,7 @@ QEMU RISC-V 'VIRT' BOARD M: Bin Meng S: Maintained F: board/emulation/qemu-riscv/ +F: board/emulation/common/ F: include/configs/qemu-riscv.h F: configs/qemu-riscv32_defconfig F: configs/qemu-riscv32_smode_defconfig diff --git a/board/emulation/qemu-x86/MAINTAINERS b/board/emulation/qemu-x86/MAINTAINERS index 9a99d38ca05..e62585a65d7 100644 --- a/board/emulation/qemu-x86/MAINTAINERS +++ b/board/emulation/qemu-x86/MAINTAINERS @@ -2,6 +2,7 @@ QEMU X86 BOARD M: Bin Meng S: Maintained F: board/emulation/qemu-x86/ +F: board/emulation/common/ F: include/configs/qemu-x86.h F: configs/qemu-x86_defconfig @@ -9,5 +10,6 @@ QEMU X86 64-bit BOARD M: Bin Meng S: Maintained F: board/emulation/qemu-x86/ +F: board/emulation/common/ F: include/configs/qemu-x86.h F: configs/qemu-x86_64_defconfig diff --git a/board/engicam/imx6q/MAINTAINERS b/board/engicam/imx6q/MAINTAINERS index 6b46378c54e..266da95ec02 100644 --- a/board/engicam/imx6q/MAINTAINERS +++ b/board/engicam/imx6q/MAINTAINERS @@ -2,6 +2,7 @@ MX6Q_ENGICAM BOARD M: Jagan Teki S: Maintained F: board/engicam/imx6q +F: board/engicam/common F: include/configs/imx6-engicam.h F: configs/imx6qdl_icore_mmc_defconfig F: configs/imx6q_icore_nand_defconfig diff --git a/board/engicam/imx6ul/MAINTAINERS b/board/engicam/imx6ul/MAINTAINERS index 88db309aec1..b9c6af27245 100644 --- a/board/engicam/imx6ul/MAINTAINERS +++ b/board/engicam/imx6ul/MAINTAINERS @@ -2,6 +2,7 @@ MX6UL_ENGICAM BOARD M: Jagan Teki S: Maintained F: board/engicam/imx6ul +F: board/engicam/common F: include/configs/imx6-engicam.h F: configs/imx6ul_geam_mmc_defconfig F: configs/imx6ul_geam_nand_defconfig diff --git a/board/engicam/imx8mm/MAINTAINERS b/board/engicam/imx8mm/MAINTAINERS index 2e99a5995fe..ec0ad514481 100644 --- a/board/engicam/imx8mm/MAINTAINERS +++ b/board/engicam/imx8mm/MAINTAINERS @@ -9,5 +9,6 @@ M: Jagan Teki M: Matteo Lisi S: Maintained F: board/engicam/imx8mm +F: board/engicam/common F: include/configs/imx8mm_icore_mx8mm.h F: configs/imx8mm-icore-mx8mm-edimm2.2_defconfig diff --git a/board/engicam/imx8mp/MAINTAINERS b/board/engicam/imx8mp/MAINTAINERS index a25908a76c7..c86f9bc9154 100644 --- a/board/engicam/imx8mp/MAINTAINERS +++ b/board/engicam/imx8mp/MAINTAINERS @@ -3,5 +3,6 @@ M: Manoj Sai M: Matteo Lisi S: Maintained F: board/engicam/imx8mp +F: board/engicam/common F: include/configs/imx8mp_icore_mx8mp.h F: configs/imx8mp-icore-mx8mp-edimm2.2_defconfig diff --git a/board/engicam/px30_core/MAINTAINERS b/board/engicam/px30_core/MAINTAINERS index 77f0c2dba59..99c5f283fc9 100644 --- a/board/engicam/px30_core/MAINTAINERS +++ b/board/engicam/px30_core/MAINTAINERS @@ -15,5 +15,6 @@ M: Jagan Teki M: Suniel Mahesh S: Maintained F: board/engicam/px30_core +F: board/engicam/common F: include/configs/px30_core.h F: configs/px30-core-edimm2.2-px30_defconfig diff --git a/board/engicam/stm32mp1/MAINTAINERS b/board/engicam/stm32mp1/MAINTAINERS index 405ff991851..4ba2a761849 100644 --- a/board/engicam/stm32mp1/MAINTAINERS +++ b/board/engicam/stm32mp1/MAINTAINERS @@ -23,4 +23,5 @@ M: Matteo Lisi S: Maintained F: arch/arm/dts/stm32mp15*icore* F: board/engicam/stm32mp1 +F: board/engicam/common F: configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig diff --git a/board/gdsys/a38x/MAINTAINERS b/board/gdsys/a38x/MAINTAINERS index 6492e79541c..bd8172065ff 100644 --- a/board/gdsys/a38x/MAINTAINERS +++ b/board/gdsys/a38x/MAINTAINERS @@ -2,5 +2,6 @@ A38X BOARD M: Mario Six S: Maintained F: board/gdsys/a38x/ +F: board/gdsys/common/ F: include/configs/controlcenterdc.h F: configs/controlcenterdc_defconfig diff --git a/board/gdsys/mpc8308/MAINTAINERS b/board/gdsys/mpc8308/MAINTAINERS index 57faba4695c..514cde521ba 100644 --- a/board/gdsys/mpc8308/MAINTAINERS +++ b/board/gdsys/mpc8308/MAINTAINERS @@ -2,5 +2,6 @@ MPC8308 BOARD M: Mario Six S: Maintained F: board/gdsys/mpc8308/ +F: board/gdsys/common/ F: include/configs/gazerbeam.h F: configs/gazerbeam_defconfig diff --git a/board/keymile/km83xx/MAINTAINERS b/board/keymile/km83xx/MAINTAINERS index ac1f8cbd881..8822e5d9155 100644 --- a/board/keymile/km83xx/MAINTAINERS +++ b/board/keymile/km83xx/MAINTAINERS @@ -3,6 +3,8 @@ M: Holger Brunck M: Heiko Schocher S: Maintained F: board/keymile/km83xx/ +F: board/keymile/common/ +F: board/keymile/scripts/ F: include/configs/km8360.h F: configs/kmcoge5ne_defconfig F: configs/kmeter1_defconfig diff --git a/board/keymile/kmcent2/MAINTAINERS b/board/keymile/kmcent2/MAINTAINERS index 1426475556c..1026188b94c 100644 --- a/board/keymile/kmcent2/MAINTAINERS +++ b/board/keymile/kmcent2/MAINTAINERS @@ -2,6 +2,8 @@ KMCENT2 BOARD M: Niel Fourie S: Maintained F: board/keymile/kmcent2/ +F: board/keymile/common/ +F: board/keymile/scripts/ F: include/configs/kmcent2.h F: configs/kmcent2_defconfig F: arch/powerpc/dts/kmcent2.dts diff --git a/board/keymile/pg-wcom-ls102xa/MAINTAINERS b/board/keymile/pg-wcom-ls102xa/MAINTAINERS index 33db2b2bea3..ed5baf269a7 100644 --- a/board/keymile/pg-wcom-ls102xa/MAINTAINERS +++ b/board/keymile/pg-wcom-ls102xa/MAINTAINERS @@ -3,6 +3,8 @@ M: Aleksandar Gerasimovski M: Rainer Boschung S: Maintained F: board/keymile/pg-wcom-ls102xa/ +F: board/keymile/common/ +F: board/keymile/scripts/ F: include/configs/km/pg-wcom-ls102xa.h F: include/configs/pg-wcom-seli8.h F: include/configs/pg-wcom-expu1.h diff --git a/board/keymile/secu1/MAINTAINERS b/board/keymile/secu1/MAINTAINERS index 833b3fdeabb..8df25f8123e 100644 --- a/board/keymile/secu1/MAINTAINERS +++ b/board/keymile/secu1/MAINTAINERS @@ -1,5 +1,7 @@ Hitachi Power Grids SECU1 BOARD M: Holger Brunck S: Maintained +F: board/keymile/common/ +F: board/keymile/scripts/ F: include/configs/socfpga_arria5_secu1.h F: configs/socfpga_secu1_defconfig diff --git a/board/toradex/apalis-imx8/MAINTAINERS b/board/toradex/apalis-imx8/MAINTAINERS index 03b0fda0e17..198399c879a 100644 --- a/board/toradex/apalis-imx8/MAINTAINERS +++ b/board/toradex/apalis-imx8/MAINTAINERS @@ -5,6 +5,7 @@ S: Maintained F: arch/arm/dts/fsl-imx8qm-apalis.dts F: arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi F: board/toradex/apalis-imx8/ +F: board/toradex/common/ F: configs/apalis-imx8_defconfig F: doc/board/toradex/apalis-imx8.rst F: include/configs/apalis-imx8.h diff --git a/board/toradex/apalis-tk1/MAINTAINERS b/board/toradex/apalis-tk1/MAINTAINERS index 3c908e11928..e2c6f63dcc7 100644 --- a/board/toradex/apalis-tk1/MAINTAINERS +++ b/board/toradex/apalis-tk1/MAINTAINERS @@ -2,6 +2,7 @@ Apalis TK1 M: Marcel Ziswiler S: Maintained F: board/toradex/apalis-tk1/ +F: board/toradex/common/ F: include/configs/apalis-tk1.h F: configs/apalis-tk1_defconfig F: arch/arm/dts/tegra124-apalis.dtb diff --git a/board/toradex/apalis_imx6/MAINTAINERS b/board/toradex/apalis_imx6/MAINTAINERS index 9c36ae19a8d..0b2907bbe70 100644 --- a/board/toradex/apalis_imx6/MAINTAINERS +++ b/board/toradex/apalis_imx6/MAINTAINERS @@ -7,5 +7,6 @@ F: arch/arm/dts/imx6q-apalis-eval.dts F: arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi F: arch/arm/dts/imx6qdl-apalis.dtsi F: board/toradex/apalis_imx6/ +F: board/toradex/common/ F: configs/apalis_imx6_defconfig F: include/configs/apalis_imx6.h diff --git a/board/toradex/apalis_t30/MAINTAINERS b/board/toradex/apalis_t30/MAINTAINERS index 01bc73e46d5..097db7deb08 100644 --- a/board/toradex/apalis_t30/MAINTAINERS +++ b/board/toradex/apalis_t30/MAINTAINERS @@ -2,6 +2,7 @@ Apalis T30 M: Marcel Ziswiler S: Maintained F: board/toradex/apalis_t30/ +F: board/toradex/common/ F: include/configs/apalis_t30.h F: configs/apalis_t30_defconfig F: arch/arm/dts/tegra30-apalis.dtb diff --git a/board/toradex/colibri-imx6ull/MAINTAINERS b/board/toradex/colibri-imx6ull/MAINTAINERS index 37c485aa6b7..ee6fe6c13ea 100644 --- a/board/toradex/colibri-imx6ull/MAINTAINERS +++ b/board/toradex/colibri-imx6ull/MAINTAINERS @@ -11,6 +11,7 @@ F: arch/arm/dts/imx6ull-colibri-eval-v3.dtsi F: arch/arm/dts/imx6ull-colibri-nonwifi.dtsi F: arch/arm/dts/imx6ull-colibri-u-boot.dtsi F: board/toradex/colibri-imx6ull/ +F: board/toradex/common/ F: configs/colibri-imx6ull_defconfig F: configs/colibri-imx6ull-emmc_defconfig F: include/configs/colibri-imx6ull.h diff --git a/board/toradex/colibri-imx8x/MAINTAINERS b/board/toradex/colibri-imx8x/MAINTAINERS index de62f87a560..8c9bf1f63f4 100644 --- a/board/toradex/colibri-imx8x/MAINTAINERS +++ b/board/toradex/colibri-imx8x/MAINTAINERS @@ -5,6 +5,7 @@ S: Maintained F: arch/arm/dts/fsl-imx8x-colibri.dts F: arch/arm/dts/fsl-imx8x-colibri-u-boot.dtsi F: board/toradex/colibri-imx8x/ +F: board/toradex/common/ F: configs/colibri-imx8x_defconfig F: doc/board/toradex/colibri-imx8x.rst F: include/configs/colibri-imx8x.h diff --git a/board/toradex/colibri_imx6/MAINTAINERS b/board/toradex/colibri_imx6/MAINTAINERS index f7a5ad59f86..25d3a06a852 100644 --- a/board/toradex/colibri_imx6/MAINTAINERS +++ b/board/toradex/colibri_imx6/MAINTAINERS @@ -4,6 +4,7 @@ W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained F: board/toradex/colibri_imx6/ +F: board/toradex/common/ F: include/configs/colibri_imx6.h F: configs/colibri_imx6_defconfig F: arch/arm/dts/imx6dl-colibri-eval-v3.dts diff --git a/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS index 513679a41c8..e4583d5a86a 100644 --- a/board/toradex/colibri_imx7/MAINTAINERS +++ b/board/toradex/colibri_imx7/MAINTAINERS @@ -10,6 +10,7 @@ F: arch/arm/boot/dts/imx7d-colibri-emmc.dtsi F: arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts F: arch/arm/boot/dts/imx7d-colibri-eval-v3.dts F: board/toradex/colibri_imx7/ +F: board/toradex/common/ F: configs/colibri_imx7_defconfig F: configs/colibri_imx7_emmc_defconfig F: doc/board/toradex/colibri_imx7.rst diff --git a/board/toradex/colibri_t20/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS index 77c2fc39e61..d0c5b113331 100644 --- a/board/toradex/colibri_t20/MAINTAINERS +++ b/board/toradex/colibri_t20/MAINTAINERS @@ -2,6 +2,7 @@ COLIBRI_T20 M: Marcel Ziswiler S: Maintained F: board/toradex/colibri_t20/ +F: board/toradex/common/ F: include/configs/colibri_t20.h F: configs/colibri_t20_defconfig F: arch/arm/dts/tegra20-colibri.dtb diff --git a/board/toradex/colibri_t30/MAINTAINERS b/board/toradex/colibri_t30/MAINTAINERS index c2d6587ed02..006a0e55f11 100644 --- a/board/toradex/colibri_t30/MAINTAINERS +++ b/board/toradex/colibri_t30/MAINTAINERS @@ -2,6 +2,7 @@ Colibri T30 M: Marcel Ziswiler S: Maintained F: board/toradex/colibri_t30/ +F: board/toradex/common/ F: include/configs/colibri_t30.h F: configs/colibri_t30_defconfig F: arch/arm/dts/tegra30-colibri.dtb diff --git a/board/toradex/colibri_vf/MAINTAINERS b/board/toradex/colibri_vf/MAINTAINERS index f821a3334b6..2e1a74c2db7 100644 --- a/board/toradex/colibri_vf/MAINTAINERS +++ b/board/toradex/colibri_vf/MAINTAINERS @@ -8,5 +8,6 @@ F: arch/arm/dts/vf-colibri-eval-v3.dtsi F: arch/arm/dts/vf610-colibri-eval-v3-u-boot.dtsi F: arch/arm/dts/vf610-colibri.dts F: board/toradex/colibri_vf/ +F: board/toradex/common/ F: configs/colibri_vf_defconfig F: include/configs/colibri_vf.h diff --git a/board/toradex/verdin-imx8mm/MAINTAINERS b/board/toradex/verdin-imx8mm/MAINTAINERS index b0f4329253a..8217bbcdc0c 100644 --- a/board/toradex/verdin-imx8mm/MAINTAINERS +++ b/board/toradex/verdin-imx8mm/MAINTAINERS @@ -8,6 +8,7 @@ F: arch/arm/dts/imx8mm-verdin-wifi.dtsi F: arch/arm/dts/imx8mm-verdin-wifi-dev.dts F: arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi F: board/toradex/verdin-imx8mm/ +F: board/toradex/common/ F: configs/verdin-imx8mm_defconfig F: doc/board/toradex/verdin-imx8mm.rst F: include/configs/verdin-imx8mm.h diff --git a/board/toradex/verdin-imx8mp/MAINTAINERS b/board/toradex/verdin-imx8mp/MAINTAINERS index ea04a83926a..85d6be88163 100644 --- a/board/toradex/verdin-imx8mp/MAINTAINERS +++ b/board/toradex/verdin-imx8mp/MAINTAINERS @@ -5,6 +5,7 @@ F: arch/arm/dts/imx8mp-verdin-wifi.dtsi F: arch/arm/dts/imx8mp-verdin-wifi-dev.dts F: arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi F: board/toradex/verdin-imx8mp/ +F: board/toradex/common/ F: configs/verdin-imx8mp_defconfig F: doc/board/toradex/verdin-imx8mp.rst F: include/configs/verdin-imx8mp.h From 5f1720f282043b86d7755ef975d3a813733d3944 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:32 -0400 Subject: [PATCH 20/24] MAINTAINERS: Fix path typos and similar We have a number of cases where the in-tree path of files and where they presumably were when the first version of a patch were posted differ slightly. Correct these to point at where the files are now. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/anbernic/rgxx3_rk3566/MAINTAINERS | 4 ++-- board/broadcom/bcmns/MAINTAINERS | 4 ++-- board/bsh/imx6ulz_smm_m2/MAINTAINERS | 2 +- board/cei/cei-tk1-som/MAINTAINERS | 2 +- board/comtrend/ar5315u/MAINTAINERS | 2 +- board/comtrend/ar5387un/MAINTAINERS | 2 +- board/comtrend/ct5361/MAINTAINERS | 2 +- board/comtrend/vr3032u/MAINTAINERS | 2 +- board/comtrend/wap5813n/MAINTAINERS | 2 +- board/data_modul/imx8mm_edm_sbc/MAINTAINERS | 2 +- board/data_modul/imx8mp_edm_sbc/MAINTAINERS | 2 +- board/google/chromebox_panther/MAINTAINERS | 2 +- board/hardkernel/odroid_go2/MAINTAINERS | 2 +- board/pine64/pinebook-pro-rk3399/MAINTAINERS | 2 +- board/pine64/pinephone-pro-rk3399/MAINTAINERS | 2 +- board/ronetix/imx7-cm/MAINTAINERS | 6 +++--- board/seeed/npi_imx6ull/MAINTAINERS | 2 +- board/solidrun/clearfog/MAINTAINERS | 2 +- board/vamrs/rock960_rk3399/MAINTAINERS | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/board/anbernic/rgxx3_rk3566/MAINTAINERS b/board/anbernic/rgxx3_rk3566/MAINTAINERS index 647e49d28ab..1c0d3fe7b5b 100644 --- a/board/anbernic/rgxx3_rk3566/MAINTAINERS +++ b/board/anbernic/rgxx3_rk3566/MAINTAINERS @@ -1,6 +1,6 @@ RGXX3-RK3566 M: Chris Morgan S: Maintained -F: board/anbernic/rgxx3-rk3566 -F: include/configs/anbernic-rgxx3-rk3566 +F: board/anbernic/rgxx3_rk3566 +F: include/configs/anbernic-rgxx3-rk3566.h F: configs/anbernic-rgxx3_defconfig diff --git a/board/broadcom/bcmns/MAINTAINERS b/board/broadcom/bcmns/MAINTAINERS index 86b68c989cd..63c6d8bb4ac 100644 --- a/board/broadcom/bcmns/MAINTAINERS +++ b/board/broadcom/bcmns/MAINTAINERS @@ -1,6 +1,6 @@ BCMNS BOARD M: Linus Walleij S: Maintained -F: board/broadcom/bcmnsp/ +F: board/broadcom/bcmns/ F: configs/bcmns_defconfig -F: include/configs/bcmnsp.h +F: include/configs/bcmns.h diff --git a/board/bsh/imx6ulz_smm_m2/MAINTAINERS b/board/bsh/imx6ulz_smm_m2/MAINTAINERS index 8f3d79dbb84..77a033c6cbb 100644 --- a/board/bsh/imx6ulz_smm_m2/MAINTAINERS +++ b/board/bsh/imx6ulz_smm_m2/MAINTAINERS @@ -1,6 +1,6 @@ MX6ULZ_SMM_M2 BOARD M: Michael Trimarchi S: Maintained -F: board/bsh/mx6ulz_smm_m2/ +F: board/bsh/imx6ulz_smm_m2/ F: include/configs/imx6ulz_smm_m2.h F: configs/imx6ulz_smm_m2_defconfig diff --git a/board/cei/cei-tk1-som/MAINTAINERS b/board/cei/cei-tk1-som/MAINTAINERS index 192e1a34a76..f1817401a5d 100644 --- a/board/cei/cei-tk1-som/MAINTAINERS +++ b/board/cei/cei-tk1-som/MAINTAINERS @@ -1,6 +1,6 @@ TK1-SOM BOARD M: Peter.Chubb@data61.csiro.au S: Maintained -F: board/cei/tk1-som/ +F: board/cei/cei-tk1-som/ F: include/configs/cei-tk1-som.h F: configs/cei-tk1-som_defconfig diff --git a/board/comtrend/ar5315u/MAINTAINERS b/board/comtrend/ar5315u/MAINTAINERS index 048073cb422..0515e03f606 100644 --- a/board/comtrend/ar5315u/MAINTAINERS +++ b/board/comtrend/ar5315u/MAINTAINERS @@ -1,6 +1,6 @@ COMTREND AR-5315U BOARD M: Álvaro Fernández Rojas S: Maintained -F: board/comtrend/ar-5315u/ +F: board/comtrend/ar5315u/ F: include/configs/comtrend_ar5315u.h F: configs/comtrend_ar5315u_ram_defconfig diff --git a/board/comtrend/ar5387un/MAINTAINERS b/board/comtrend/ar5387un/MAINTAINERS index bcaac64db09..48757c9fd75 100644 --- a/board/comtrend/ar5387un/MAINTAINERS +++ b/board/comtrend/ar5387un/MAINTAINERS @@ -1,6 +1,6 @@ COMTREND AR-5387UN BOARD M: Álvaro Fernández Rojas S: Maintained -F: board/comtrend/ar-5387un/ +F: board/comtrend/ar5387un/ F: include/configs/comtrend_ar5387un.h F: configs/comtrend_ar5387un_ram_defconfig diff --git a/board/comtrend/ct5361/MAINTAINERS b/board/comtrend/ct5361/MAINTAINERS index aea737a0bbd..3373e5036be 100644 --- a/board/comtrend/ct5361/MAINTAINERS +++ b/board/comtrend/ct5361/MAINTAINERS @@ -1,6 +1,6 @@ COMTREND CT-5361 BOARD M: Álvaro Fernández Rojas S: Maintained -F: board/comtrend/ct-5361/ +F: board/comtrend/ct5361/ F: include/configs/comtrend_ct5361.h F: configs/comtrend_ct5361_ram_defconfig diff --git a/board/comtrend/vr3032u/MAINTAINERS b/board/comtrend/vr3032u/MAINTAINERS index 833d7da4afa..132101f4cd0 100644 --- a/board/comtrend/vr3032u/MAINTAINERS +++ b/board/comtrend/vr3032u/MAINTAINERS @@ -1,6 +1,6 @@ COMTREND VR-3032U BOARD M: Álvaro Fernández Rojas S: Maintained -F: board/comtrend/vr-3032u/ +F: board/comtrend/vr3032u/ F: include/configs/comtrend_vr-3032u.h F: configs/comtrend_vr3032u_ram_defconfig diff --git a/board/comtrend/wap5813n/MAINTAINERS b/board/comtrend/wap5813n/MAINTAINERS index f4d99796b4d..c6764831b2b 100644 --- a/board/comtrend/wap5813n/MAINTAINERS +++ b/board/comtrend/wap5813n/MAINTAINERS @@ -1,6 +1,6 @@ COMTREND WAP-5813N BOARD M: Álvaro Fernández Rojas S: Maintained -F: board/comtrend/wap-5813n/ +F: board/comtrend/wap5813n/ F: include/configs/comtrend_wap-5813n.h F: configs/comtrend_wap5813n_ram_defconfig diff --git a/board/data_modul/imx8mm_edm_sbc/MAINTAINERS b/board/data_modul/imx8mm_edm_sbc/MAINTAINERS index 72659c081e2..36af19b78f9 100644 --- a/board/data_modul/imx8mm_edm_sbc/MAINTAINERS +++ b/board/data_modul/imx8mm_edm_sbc/MAINTAINERS @@ -3,6 +3,6 @@ M: Marek Vasut S: Maintained F: arch/arm/dts/imx8mm-data-modul-edm-sbc.dts F: arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi -F: board/data_modul/imx8mm_data_modul_edm_sbc/ +F: board/data_modul/imx8mm_edm_sbc/ F: configs/imx8mm_data_modul_edm_sbc_defconfig F: include/configs/imx8mm_data_modul_edm_sbc.h diff --git a/board/data_modul/imx8mp_edm_sbc/MAINTAINERS b/board/data_modul/imx8mp_edm_sbc/MAINTAINERS index a67e1047619..8a49c8a67d5 100644 --- a/board/data_modul/imx8mp_edm_sbc/MAINTAINERS +++ b/board/data_modul/imx8mp_edm_sbc/MAINTAINERS @@ -3,6 +3,6 @@ M: Marek Vasut S: Maintained F: arch/arm/dts/imx8mp-data-modul-edm-sbc.dts F: arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi -F: board/data_modul/imx8mp_data_modul_edm_sbc/ +F: board/data_modul/imx8mp_edm_sbc/ F: configs/imx8mp_data_modul_edm_sbc_defconfig F: include/configs/imx8mp_data_modul_edm_sbc.h diff --git a/board/google/chromebox_panther/MAINTAINERS b/board/google/chromebox_panther/MAINTAINERS index c88774bc868..4963a895bba 100644 --- a/board/google/chromebox_panther/MAINTAINERS +++ b/board/google/chromebox_panther/MAINTAINERS @@ -1,6 +1,6 @@ CHROMEBOX PANTHER BOARD M: Simon Glass S: Maintained -F: board/google/chromebook_panther/ +F: board/google/chromebox_panther/ F: include/configs/chromebox_panther.h F: configs/chromebox_panther_defconfig diff --git a/board/hardkernel/odroid_go2/MAINTAINERS b/board/hardkernel/odroid_go2/MAINTAINERS index eab622a70b7..4d4c6e8fef6 100644 --- a/board/hardkernel/odroid_go2/MAINTAINERS +++ b/board/hardkernel/odroid_go2/MAINTAINERS @@ -1,6 +1,6 @@ GO2 M: Heiko Stuebner S: Maintained -F: board/odroid/go2 +F: board/hardkernel/odroid_go2/ F: include/configs/odroid_go2.h F: configs/odroid-go2_defconfig diff --git a/board/pine64/pinebook-pro-rk3399/MAINTAINERS b/board/pine64/pinebook-pro-rk3399/MAINTAINERS index 227c1c0bea9..7300ca1b1b8 100644 --- a/board/pine64/pinebook-pro-rk3399/MAINTAINERS +++ b/board/pine64/pinebook-pro-rk3399/MAINTAINERS @@ -1,7 +1,7 @@ PINEBOOK_PRO M: Peter Robinson S: Maintained -F: board/pine64/rk3399-pinebook-pro/ +F: board/pine64/pinebook-pro-rk3399/ F: include/configs/rk3399-pinebook-pro.h F: arch/arm/dts/rk3399-pinebook-pro.dts F: arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi diff --git a/board/pine64/pinephone-pro-rk3399/MAINTAINERS b/board/pine64/pinephone-pro-rk3399/MAINTAINERS index c923ff1be32..bc2dcdd8d42 100644 --- a/board/pine64/pinephone-pro-rk3399/MAINTAINERS +++ b/board/pine64/pinephone-pro-rk3399/MAINTAINERS @@ -1,7 +1,7 @@ PINEPHONE_PRO M: Peter Robinson S: Maintained -F: board/pine64/rk3399-pinephone-pro/ +F: board/pine64/pinephone-pro-rk3399/ F: include/configs/rk3399-pinephone-pro.h F: arch/arm/dts/rk3399-pinephone-pro.dts F: arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi diff --git a/board/ronetix/imx7-cm/MAINTAINERS b/board/ronetix/imx7-cm/MAINTAINERS index 184c8874638..158c2b7cd08 100644 --- a/board/ronetix/imx7-cm/MAINTAINERS +++ b/board/ronetix/imx7-cm/MAINTAINERS @@ -1,6 +1,6 @@ i.MX7-CM BOARD M: Ilko Iliev S: Maintained -F: board/ronetix/imx7_cm/ -F: include/configs/imx7_cm.h -F: configs/imx7_cm_defconfig \ No newline at end of file +F: board/ronetix/imx7-cm/ +F: include/configs/imx7-cm.h +F: configs/imx7_cm_defconfig diff --git a/board/seeed/npi_imx6ull/MAINTAINERS b/board/seeed/npi_imx6ull/MAINTAINERS index c6a915c79b3..ddf49849de1 100644 --- a/board/seeed/npi_imx6ull/MAINTAINERS +++ b/board/seeed/npi_imx6ull/MAINTAINERS @@ -4,6 +4,6 @@ S: Maintained F: arch/arm/dts/imx6ull-seeed-npi-imx6ull-dev-board.dts F: arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi F: arch/arm/dts/imx6ull-seeed-npi-imx6ull.dtsi -F: board/seeed/npi-imx6ull/ +F: board/seeed/npi_imx6ull/ F: configs/seeed_npi_imx6ull_defconfig F: include/configs/npi_imx6ull.h diff --git a/board/solidrun/clearfog/MAINTAINERS b/board/solidrun/clearfog/MAINTAINERS index 55bd1278049..6b2d5d1146e 100644 --- a/board/solidrun/clearfog/MAINTAINERS +++ b/board/solidrun/clearfog/MAINTAINERS @@ -1,7 +1,7 @@ CLEARFOG BOARD M: Stefan Roese S: Maintained -F: board/soldrun/clearfog/ +F: board/solidrun/clearfog/ F: include/configs/clearfog.h F: configs/clearfog_defconfig F: configs/clearfog_gt_8k_defconfig diff --git a/board/vamrs/rock960_rk3399/MAINTAINERS b/board/vamrs/rock960_rk3399/MAINTAINERS index 5ee52564953..8821672a3ab 100644 --- a/board/vamrs/rock960_rk3399/MAINTAINERS +++ b/board/vamrs/rock960_rk3399/MAINTAINERS @@ -1,7 +1,7 @@ ROCK960-RK3399 M: Manivannan Sadhasivam S: Maintained -F: board/rockchip/rock960_rk3399 +F: board/vamrs/rock960_rk3399/ F: include/configs/rock960_rk3399.h F: configs/rock960-rk3399_defconfig From b99476e71a675079ef38c3b1758c87bee89f9b48 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:33 -0400 Subject: [PATCH 21/24] MAINTAINERS: Deal with '+' in paths The listed paths are allowed to contain wildcards. This includes the '+' character which we have as a literal part of the path in a few cases. Escape the '+' here so that files are matched. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/k+p/kp_imx53/MAINTAINERS | 3 ++- board/k+p/kp_imx6q_tpc/MAINTAINERS | 3 ++- board/l+g/vinco/MAINTAINERS | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/board/k+p/kp_imx53/MAINTAINERS b/board/k+p/kp_imx53/MAINTAINERS index c105a93e707..daf861160a4 100644 --- a/board/k+p/kp_imx53/MAINTAINERS +++ b/board/k+p/kp_imx53/MAINTAINERS @@ -1,6 +1,7 @@ KP_IMX53_HSC BOARD M: Lukasz Majewski S: Maintained -F: board/k+p/kp_imx53/ +F: board/k\+p/kp_imx53/ +F: board/k\+p/bootscripts/tpcboot.cmd F: include/configs/kp_imx53.h F: configs/kp_imx53_defconfig diff --git a/board/k+p/kp_imx6q_tpc/MAINTAINERS b/board/k+p/kp_imx6q_tpc/MAINTAINERS index 6c4c8dd28e3..e54f4604c38 100644 --- a/board/k+p/kp_imx6q_tpc/MAINTAINERS +++ b/board/k+p/kp_imx6q_tpc/MAINTAINERS @@ -1,6 +1,7 @@ KP_IMX6Q_TPC BOARD M: Lukasz Majewski S: Maintained -F: board/k+p/kp_imx6q_tpc/ +F: board/k\+p/kp_imx6q_tpc/ +F: board/k\+p/bootscripts/tpcboot.cmd F: include/configs/kp_imx6q_tpc.h F: configs/kp_imx6q_tpc_defconfig diff --git a/board/l+g/vinco/MAINTAINERS b/board/l+g/vinco/MAINTAINERS index 0cd6044172a..14b76b14d84 100644 --- a/board/l+g/vinco/MAINTAINERS +++ b/board/l+g/vinco/MAINTAINERS @@ -1,6 +1,6 @@ VInCo Platform M: Gregory CLEMENT S: Maintained -F: board/l+g/vinco +F: board/l\+g/vinco/ F: include/configs/vinco.h F: configs/vinco_defconfig From fdfbd70da69bce709253a0d84b7908786a0cc40d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Jul 2023 19:33:34 -0400 Subject: [PATCH 22/24] MAINTAINERS: Add some missing directories or files In a few cases we have MAINTAINERS entries that are missing obvious paths or files. Typically this means a board directory that did not list itself, but in a few cases we have a Kconfig file or similar. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- MAINTAINERS | 1 + board/coreboot/coreboot/MAINTAINERS | 4 +--- board/devboards/dbm-soc1/MAINTAINERS | 1 + board/efi/efi-x86_app/MAINTAINERS | 2 ++ board/efi/efi-x86_payload/MAINTAINERS | 1 + board/firefly/firefly-rk3308/MAINTAINERS | 3 ++- board/freescale/ls1043ardb/MAINTAINERS | 1 - board/keymile/secu1/MAINTAINERS | 1 + board/softing/vining_fpga/MAINTAINERS | 1 + board/terasic/de0-nano-soc/MAINTAINERS | 1 + board/terasic/de1-soc/MAINTAINERS | 1 + board/terasic/de10-nano/MAINTAINERS | 1 + board/terasic/de10-standard/MAINTAINERS | 1 + board/terasic/sockit/MAINTAINERS | 1 + 14 files changed, 15 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 89e37381398..4a24a92460c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -272,6 +272,7 @@ M: Fabio Estevam R: NXP i.MX U-Boot Team S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-imx.git +F: arch/Kconfig.nxp F: arch/arm/cpu/arm1136/mx*/ F: arch/arm/cpu/arm926ejs/mx*/ F: arch/arm/cpu/armv7/vf610/ diff --git a/board/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS index ee12d32ce7c..f7773658000 100644 --- a/board/coreboot/coreboot/MAINTAINERS +++ b/board/coreboot/coreboot/MAINTAINERS @@ -1,13 +1,11 @@ COREBOOT BOARD M: Simon Glass S: Maintained -F: board/coreboot/coreboot/ +F: board/coreboot/ F: include/configs/coreboot.h F: configs/coreboot_defconfig COREBOOT64 BOARD M: Simon Glass S: Maintained -F: board/coreboot/coreboot/ -F: include/configs/coreboot.h F: configs/coreboot64_defconfig diff --git a/board/devboards/dbm-soc1/MAINTAINERS b/board/devboards/dbm-soc1/MAINTAINERS index 625f2c88996..577eba5a281 100644 --- a/board/devboards/dbm-soc1/MAINTAINERS +++ b/board/devboards/dbm-soc1/MAINTAINERS @@ -1,5 +1,6 @@ Devboards.de DBM-SoC1 BOARD M: Marek Vasut S: Maintained +F: board/devboards/dbm-soc1/ F: include/configs/socfpga_dbm_soc1.h F: configs/socfpga_dbm_soc1_defconfig diff --git a/board/efi/efi-x86_app/MAINTAINERS b/board/efi/efi-x86_app/MAINTAINERS index b292811a8f0..584619c51df 100644 --- a/board/efi/efi-x86_app/MAINTAINERS +++ b/board/efi/efi-x86_app/MAINTAINERS @@ -1,6 +1,7 @@ EFI-X86_APP32 BOARD M: Simon Glass S: Maintained +F: board/efi/Kconfig F: board/efi/efi-x86_app/ F: include/configs/efi-x86_app.h F: configs/efi-x86_app32_defconfig @@ -8,6 +9,7 @@ F: configs/efi-x86_app32_defconfig EFI-X86_APP64 BOARD M: Simon Glass S: Maintained +F: board/efi/Kconfig F: board/efi/efi-x86_app/ F: include/configs/efi-x86_app.h F: configs/efi-x86_app64_defconfig diff --git a/board/efi/efi-x86_payload/MAINTAINERS b/board/efi/efi-x86_payload/MAINTAINERS index abf3a1574b0..d795d60e09e 100644 --- a/board/efi/efi-x86_payload/MAINTAINERS +++ b/board/efi/efi-x86_payload/MAINTAINERS @@ -1,6 +1,7 @@ EFI-X86_PAYLOAD BOARD M: Bin Meng S: Maintained +F: board/efi/Kconfig F: board/efi/efi-x86_payload/ F: include/configs/efi-x86_payload.h F: configs/efi-x86_payload32_defconfig diff --git a/board/firefly/firefly-rk3308/MAINTAINERS b/board/firefly/firefly-rk3308/MAINTAINERS index 199079717e7..e584038a203 100644 --- a/board/firefly/firefly-rk3308/MAINTAINERS +++ b/board/firefly/firefly-rk3308/MAINTAINERS @@ -1,5 +1,6 @@ ROC-RK3308-CC M: Andy Yan S: Maintained -F: board/firefly/firefly-rk3308/roc_cc_rk3308.c +F: board/firefly/firefly-rk3308/ F: configs/roc-cc-rk3308_defconfig +F: include/configs/firefly_rk3308.h diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS index 36e7331538f..8e14ba3608b 100644 --- a/board/freescale/ls1043ardb/MAINTAINERS +++ b/board/freescale/ls1043ardb/MAINTAINERS @@ -3,7 +3,6 @@ M: Mingkai Hu M: Rajesh Bhagat S: Maintained F: board/freescale/ls1043ardb/ -F: board/freescale/ls1043ardb/ls1043ardb.c F: include/configs/ls1043ardb.h F: configs/ls1043ardb_defconfig F: configs/ls1043ardb_nand_defconfig diff --git a/board/keymile/secu1/MAINTAINERS b/board/keymile/secu1/MAINTAINERS index 8df25f8123e..e441f252aa2 100644 --- a/board/keymile/secu1/MAINTAINERS +++ b/board/keymile/secu1/MAINTAINERS @@ -1,6 +1,7 @@ Hitachi Power Grids SECU1 BOARD M: Holger Brunck S: Maintained +F: board/keymile/secu1/ F: board/keymile/common/ F: board/keymile/scripts/ F: include/configs/socfpga_arria5_secu1.h diff --git a/board/softing/vining_fpga/MAINTAINERS b/board/softing/vining_fpga/MAINTAINERS index c2002fe3cef..ed44b09f327 100644 --- a/board/softing/vining_fpga/MAINTAINERS +++ b/board/softing/vining_fpga/MAINTAINERS @@ -1,5 +1,6 @@ VINING FPGA BOARD M: Marek Vasut S: Maintained +F: board/softing/vining_fpga/ F: include/configs/socfpga_vining_fpga.h F: configs/socfpga_vining_fpga_defconfig diff --git a/board/terasic/de0-nano-soc/MAINTAINERS b/board/terasic/de0-nano-soc/MAINTAINERS index 7f4cf1e7f54..6ffa0c07382 100644 --- a/board/terasic/de0-nano-soc/MAINTAINERS +++ b/board/terasic/de0-nano-soc/MAINTAINERS @@ -1,5 +1,6 @@ SOCFPGA ATLAS BOARD M: Dinh Nguyen S: Maintained +F: board/terasic/de0-nano-soc/ F: include/configs/socfpga_de0_nano_soc.h F: configs/socfpga_de0_nano_soc_defconfig diff --git a/board/terasic/de1-soc/MAINTAINERS b/board/terasic/de1-soc/MAINTAINERS index bd7a8d5f4ca..1e726e93603 100644 --- a/board/terasic/de1-soc/MAINTAINERS +++ b/board/terasic/de1-soc/MAINTAINERS @@ -1,5 +1,6 @@ DE1-SoC BOARD M: Anatolij Gustschin S: Maintained +F: board/terasic/de1-soc/ F: include/configs/socfpga_de1_soc.h F: configs/socfpga_de1_soc_defconfig diff --git a/board/terasic/de10-nano/MAINTAINERS b/board/terasic/de10-nano/MAINTAINERS index f4dd0dff3ba..ebfd3b209d0 100644 --- a/board/terasic/de10-nano/MAINTAINERS +++ b/board/terasic/de10-nano/MAINTAINERS @@ -1,5 +1,6 @@ DE10-NANO BOARD M: Dalon Westergreen S: Maintained +F: board/terasic/de10-nano/ F: include/configs/socfpga_de10_nano.h F: configs/socfpga_de10_nano_defconfig diff --git a/board/terasic/de10-standard/MAINTAINERS b/board/terasic/de10-standard/MAINTAINERS index 94bf1e03eeb..49fdc7516ca 100644 --- a/board/terasic/de10-standard/MAINTAINERS +++ b/board/terasic/de10-standard/MAINTAINERS @@ -1,5 +1,6 @@ DE10-STANDARD BOARD M: Humberto Naves S: Maintained +F: board/terasic/de10-standard/ F: include/configs/socfpga_de10_standard.h F: configs/socfpga_de10_standard_defconfig diff --git a/board/terasic/sockit/MAINTAINERS b/board/terasic/sockit/MAINTAINERS index 792f18474ff..e301751fbd7 100644 --- a/board/terasic/sockit/MAINTAINERS +++ b/board/terasic/sockit/MAINTAINERS @@ -1,5 +1,6 @@ SOCKIT BOARD M: Marek Vasut S: Maintained +F: board/terasic/sockit/ F: include/configs/socfpga_sockit.h F: configs/socfpga_sockit_defconfig From 779e38a5f54556ede4068c908c4a8f8bba7558f8 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 20 Jul 2023 14:50:42 +0200 Subject: [PATCH 23/24] Makefile: Use sort shortopts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit POSIX does not defined longopts for sort, use shortops for even more compatibility. Fixes: cc5a490cf465 ("Makefile: Sort u-boot-initial-env output") Reported-by: Milan P. Stanić Signed-off-by: Marek Vasut Reviewed-by: Mark Kettenis Tested-by: Milan P. Stanić --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 87f9fc786e8..5fc16b3b1f1 100644 --- a/Makefile +++ b/Makefile @@ -2444,7 +2444,7 @@ quiet_cmd_genenv = GENENV $@ cmd_genenv = \ $(objtree)/tools/printinitialenv | \ sed -e '/^\s*$$/d' | \ - sort --field-separator='=' -k1,1 --stable -o $@ + sort -t '=' -k 1,1 -s -o $@ u-boot-initial-env: $(env_h) FORCE $(Q)$(MAKE) $(build)=tools $(objtree)/tools/printinitialenv From fa5977103978aa1998aa7b9ffe9cf495451cbbe1 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Tue, 25 Jul 2023 10:28:50 -0500 Subject: [PATCH 24/24] MAINTAINERS: Take maintainership of TI KeyStone2 support Add arch/arm/mach-keystone/ into K2 board directory MAINTAINERS file. Convert current entries into regex match style. Assign maintainership to myself. Signed-off-by: Andrew Davis --- board/ti/ks2_evm/MAINTAINERS | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/board/ti/ks2_evm/MAINTAINERS b/board/ti/ks2_evm/MAINTAINERS index 999ef0ae39b..637feec8d17 100644 --- a/board/ti/ks2_evm/MAINTAINERS +++ b/board/ti/ks2_evm/MAINTAINERS @@ -1,12 +1,9 @@ -KS2_EVM BOARD -M: Vitaly Andrianov +KeyStone II EVM Boards +M: Andrew Davis S: Maintained +F: arch/arm/mach-keystone/ F: board/ti/ks2_evm/ -F: include/configs/k2hk_evm.h -F: configs/k2hk_evm_defconfig -F: include/configs/k2e_evm.h -F: configs/k2e_evm_defconfig -F: include/configs/k2l_evm.h -F: configs/k2l_evm_defconfig -F: include/configs/k2g_evm.h -F: configs/k2g_evm_defconfig +N: k2hk +N: k2e +N: k2l +N: k2g