Merge branch '2023-07-25-assorted-general-updates'
- A number of MAINTAINER file updates, assorted driver/platform fixes,
performance improvements for sparse file writes, and 64bit time_t.
diff --git a/.mailmap b/.mailmap
index 312a428..05cb310 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,8 +65,8 @@
Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
Marek Vasut <marex@denx.de> <marex at denx.de>
Markus Klotzbuecher <mk@denx.de>
-Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
-Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
+Masahiro Yamada <masahiroy@kernel.org> <yamada.masahiro@socionext.com>
+Masahiro Yamada <masahiroy@kernel.org> <yamada.m@jp.panasonic.com>
Michal Simek <michal.simek@amd.com> <Monstr@seznam.cz>
Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
Michal Simek <michal.simek@amd.com> <monstr@monstr.eu>
diff --git a/MAINTAINERS b/MAINTAINERS
index 87991cc..4a24a92 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -272,6 +272,7 @@
R: NXP i.MX U-Boot Team <uboot-imx@nxp.com>
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/
@@ -282,6 +283,7 @@
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
@@ -840,6 +842,13 @@
S: Maintained
F: tools/buildman/
+CAAM
+M: Gaurav Jain <gaurav.jain@nxp.com>
+S: Maintained
+F: arch/arm/dts/ls1021a-twr-u-boot.dtsi
+F: drivers/crypto/fsl/
+F: include/fsl_sec.h
+
CAT
M: Roger Knecht <rknecht@pm.me>
S: Maintained
@@ -1627,10 +1636,3 @@
F: configs/tools-only_defconfig
F: *
F: */
-
-CAAM
-M: Gaurav Jain <gaurav.jain@nxp.com>
-S: Maintained
-F: arch/arm/dts/ls1021a-twr-u-boot.dtsi
-F: drivers/crypto/fsl/
-F: include/fsl_sec.h
diff --git a/Makefile b/Makefile
index 87f9fc7..5fc16b3 100644
--- a/Makefile
+++ b/Makefile
@@ -2444,7 +2444,7 @@
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index bdd535f..97c25b4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -357,7 +357,7 @@
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 @@
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/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 6e6791f..7d93872 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -100,8 +100,7 @@
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/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS
index 6b45508..a974a97 100644
--- a/board/BuR/brppt1/MAINTAINERS
+++ b/board/BuR/brppt1/MAINTAINERS
@@ -2,6 +2,7 @@
M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
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 fe65188..bfeaa57 100644
--- a/board/BuR/brppt2/MAINTAINERS
+++ b/board/BuR/brppt2/MAINTAINERS
@@ -2,5 +2,6 @@
M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
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 8d1fe21..7421f61 100644
--- a/board/BuR/brsmarc1/MAINTAINERS
+++ b/board/BuR/brsmarc1/MAINTAINERS
@@ -2,5 +2,6 @@
M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
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 5aa3671..f826a44 100644
--- a/board/BuR/brxre1/MAINTAINERS
+++ b/board/BuR/brxre1/MAINTAINERS
@@ -2,6 +2,7 @@
M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
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 7046e1b..66e8219 100644
--- a/board/LaCie/net2big_v2/MAINTAINERS
+++ b/board/LaCie/net2big_v2/MAINTAINERS
@@ -7,6 +7,7 @@
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 1cc4f71..03bc787 100644
--- a/board/LaCie/netspace_v2/MAINTAINERS
+++ b/board/LaCie/netspace_v2/MAINTAINERS
@@ -12,6 +12,7 @@
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/Marvell/db-88f6820-amc/MAINTAINERS b/board/Marvell/db-88f6820-amc/MAINTAINERS
index abf5b7e..d519eb4 100644
--- a/board/Marvell/db-88f6820-amc/MAINTAINERS
+++ b/board/Marvell/db-88f6820-amc/MAINTAINERS
@@ -4,3 +4,4 @@
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/Synology/ds109/MAINTAINERS b/board/Synology/ds109/MAINTAINERS
index 8783fdb..2c50edc 100644
--- a/board/Synology/ds109/MAINTAINERS
+++ b/board/Synology/ds109/MAINTAINERS
@@ -2,5 +2,6 @@
M: Walter Schweizer <swwa@users.sourceforge.net>
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 a5080b0..8d3cc24 100644
--- a/board/Synology/ds116/MAINTAINERS
+++ b/board/Synology/ds116/MAINTAINERS
@@ -3,5 +3,6 @@
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 502cbd7..22b7535 100644
--- a/board/Synology/ds414/MAINTAINERS
+++ b/board/Synology/ds414/MAINTAINERS
@@ -2,5 +2,6 @@
M: Phil Sutter <phil@nwl.cc>
S: Maintained
F: board/Synology/ds414/
+F: board/Synology/common/
F: include/configs/ds414.h
F: configs/ds414_defconfig
diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS
index f429c21..88c5038 100644
--- a/board/amlogic/u200/MAINTAINERS
+++ b/board/amlogic/u200/MAINTAINERS
@@ -4,7 +4,7 @@
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/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS
index 117f79e..19b1f30 100644
--- a/board/amlogic/w400/MAINTAINERS
+++ b/board/amlogic/w400/MAINTAINERS
@@ -5,6 +5,7 @@
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/anbernic/rgxx3_rk3566/MAINTAINERS b/board/anbernic/rgxx3_rk3566/MAINTAINERS
index 647e49d..1c0d3fe 100644
--- a/board/anbernic/rgxx3_rk3566/MAINTAINERS
+++ b/board/anbernic/rgxx3_rk3566/MAINTAINERS
@@ -1,6 +1,6 @@
RGXX3-RK3566
M: Chris Morgan <macromorgan@hotmail.com>
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/avionic-design/medcom-wide/MAINTAINERS b/board/avionic-design/medcom-wide/MAINTAINERS
index 0a00fcf..3d2cdec 100644
--- a/board/avionic-design/medcom-wide/MAINTAINERS
+++ b/board/avionic-design/medcom-wide/MAINTAINERS
@@ -2,5 +2,6 @@
M: Alban Bedel <alban.bedel@avionic-design.de>
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 e8ef509..0275680 100644
--- a/board/avionic-design/plutux/MAINTAINERS
+++ b/board/avionic-design/plutux/MAINTAINERS
@@ -2,5 +2,6 @@
M: Alban Bedel <alban.bedel@avionic-design.de>
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 5cbdf8e..645be81 100644
--- a/board/avionic-design/tec-ng/MAINTAINERS
+++ b/board/avionic-design/tec-ng/MAINTAINERS
@@ -2,5 +2,6 @@
M: Alban Bedel <alban.bedel@avionic-design.de>
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 10f1aac..36088e7 100644
--- a/board/avionic-design/tec/MAINTAINERS
+++ b/board/avionic-design/tec/MAINTAINERS
@@ -2,5 +2,6 @@
M: Alban Bedel <alban.bedel@avionic-design.de>
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/beacon/imx8mm/MAINTAINERS b/board/beacon/imx8mm/MAINTAINERS
index d48ba86..d8a5d09 100644
--- a/board/beacon/imx8mm/MAINTAINERS
+++ b/board/beacon/imx8mm/MAINTAINERS
@@ -5,4 +5,5 @@
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 4805cb2..6dcef21 100644
--- a/board/beacon/imx8mn/MAINTAINERS
+++ b/board/beacon/imx8mn/MAINTAINERS
@@ -5,3 +5,4 @@
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/birdland/bav335x/MAINTAINERS b/board/birdland/bav335x/MAINTAINERS
deleted file mode 100644
index 45dcfcb..0000000
--- a/board/birdland/bav335x/MAINTAINERS
+++ /dev/null
@@ -1,13 +0,0 @@
-BAV335x BOARD
-M: Gilles Gameiro <gilles@gigadevices.com>
-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 5478350..0000000
--- a/board/broadcom/bcm11130/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM11130 BOARD
-M: Steve Rae <steve.rae@raedomain.com>
-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 4cf66b7..0000000
--- a/board/broadcom/bcm11130_nand/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM11130_NAND BOARD
-M: Steve Rae <steve.rae@raedomain.com>
-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 c0558e7..0000000
--- a/board/broadcom/bcm28155_w1d/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM28155_W1D BOARD
-M: Steve Rae <steve.rae@raedomain.com>
-S: Maintained
-F: board/broadcom/bcm28155_ap/
-F: include/configs/bcm28155_ap.h
-F: configs/bcm28155_w1d_defconfig
diff --git a/board/broadcom/bcm_ep/Makefile b/board/broadcom/bcm_ep/Makefile
deleted file mode 100644
index 29a3ea7..0000000
--- 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 e91fa40..0000000
--- a/board/broadcom/bcm_ep/board.c
+++ /dev/null
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2014 Broadcom Corporation.
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <init.h>
-#include <net.h>
-#include <asm/cache.h>
-#include <asm/global_data.h>
-#include <asm/io.h>
-#include <config.h>
-#include <netdev.h>
-#include <asm/system.h>
-#include <asm/iproc-common/armpll.h>
-
-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
diff --git a/board/broadcom/bcmns/MAINTAINERS b/board/broadcom/bcmns/MAINTAINERS
index fd37c33..63c6d8b 100644
--- a/board/broadcom/bcmns/MAINTAINERS
+++ b/board/broadcom/bcmns/MAINTAINERS
@@ -1,6 +1,6 @@
BCMNS BOARD
M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained
-F: board/broadcom/bcmnsp/
-F: configs/bcmnsp_defconfig
-F: include/configs/bcmnsp.h
+F: board/broadcom/bcmns/
+F: configs/bcmns_defconfig
+F: include/configs/bcmns.h
diff --git a/board/bsh/imx6ulz_smm_m2/MAINTAINERS b/board/bsh/imx6ulz_smm_m2/MAINTAINERS
index 8f3d79d..77a033c 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 <michael@amarulasolutions.com>
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 192e1a3..f181740 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 048073c..0515e03 100644
--- a/board/comtrend/ar5315u/MAINTAINERS
+++ b/board/comtrend/ar5315u/MAINTAINERS
@@ -1,6 +1,6 @@
COMTREND AR-5315U BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
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 bcaac64..48757c9 100644
--- a/board/comtrend/ar5387un/MAINTAINERS
+++ b/board/comtrend/ar5387un/MAINTAINERS
@@ -1,6 +1,6 @@
COMTREND AR-5387UN BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
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 aea737a..3373e50 100644
--- a/board/comtrend/ct5361/MAINTAINERS
+++ b/board/comtrend/ct5361/MAINTAINERS
@@ -1,6 +1,6 @@
COMTREND CT-5361 BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
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 833d7da..132101f 100644
--- a/board/comtrend/vr3032u/MAINTAINERS
+++ b/board/comtrend/vr3032u/MAINTAINERS
@@ -1,6 +1,6 @@
COMTREND VR-3032U BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
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 f4d9979..c676483 100644
--- a/board/comtrend/wap5813n/MAINTAINERS
+++ b/board/comtrend/wap5813n/MAINTAINERS
@@ -1,6 +1,6 @@
COMTREND WAP-5813N BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
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/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS
index ee12d32..f777365 100644
--- a/board/coreboot/coreboot/MAINTAINERS
+++ b/board/coreboot/coreboot/MAINTAINERS
@@ -1,13 +1,11 @@
COREBOOT BOARD
M: Simon Glass <sjg@chromium.org>
S: Maintained
-F: board/coreboot/coreboot/
+F: board/coreboot/
F: include/configs/coreboot.h
F: configs/coreboot_defconfig
COREBOOT64 BOARD
M: Simon Glass <sjg@chromium.org>
S: Maintained
-F: board/coreboot/coreboot/
-F: include/configs/coreboot.h
F: configs/coreboot64_defconfig
diff --git a/board/data_modul/imx8mm_edm_sbc/MAINTAINERS b/board/data_modul/imx8mm_edm_sbc/MAINTAINERS
index 72659c0..36af19b 100644
--- a/board/data_modul/imx8mm_edm_sbc/MAINTAINERS
+++ b/board/data_modul/imx8mm_edm_sbc/MAINTAINERS
@@ -3,6 +3,6 @@
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 a67e104..8a49c8a 100644
--- a/board/data_modul/imx8mp_edm_sbc/MAINTAINERS
+++ b/board/data_modul/imx8mp_edm_sbc/MAINTAINERS
@@ -3,6 +3,6 @@
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/devboards/dbm-soc1/MAINTAINERS b/board/devboards/dbm-soc1/MAINTAINERS
index 625f2c8..577eba5 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 <marex@denx.de>
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 b292811..584619c 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 <sjg@chromium.org>
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 @@
EFI-X86_APP64 BOARD
M: Simon Glass <sjg@chromium.org>
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 abf3a15..d795d60 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 <bmeng.cn@gmail.com>
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/emulation/qemu-arm/MAINTAINERS b/board/emulation/qemu-arm/MAINTAINERS
index e757ffc..5154262 100644
--- a/board/emulation/qemu-arm/MAINTAINERS
+++ b/board/emulation/qemu-arm/MAINTAINERS
@@ -2,6 +2,7 @@
M: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
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 7317983..348ae90 100644
--- a/board/emulation/qemu-ppce500/MAINTAINERS
+++ b/board/emulation/qemu-ppce500/MAINTAINERS
@@ -3,5 +3,6 @@
M: Bin Meng <bmeng.cn@gmail.com>
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 78969ed..3d7453f 100644
--- a/board/emulation/qemu-riscv/MAINTAINERS
+++ b/board/emulation/qemu-riscv/MAINTAINERS
@@ -2,6 +2,7 @@
M: Bin Meng <bmeng.cn@gmail.com>
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 9a99d38..e62585a 100644
--- a/board/emulation/qemu-x86/MAINTAINERS
+++ b/board/emulation/qemu-x86/MAINTAINERS
@@ -2,6 +2,7 @@
M: Bin Meng <bmeng.cn@gmail.com>
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 @@
M: Bin Meng <bmeng.cn@gmail.com>
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 6b46378..266da95 100644
--- a/board/engicam/imx6q/MAINTAINERS
+++ b/board/engicam/imx6q/MAINTAINERS
@@ -2,6 +2,7 @@
M: Jagan Teki <jagan@amarulasolutions.com>
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 88db309..b9c6af2 100644
--- a/board/engicam/imx6ul/MAINTAINERS
+++ b/board/engicam/imx6ul/MAINTAINERS
@@ -2,6 +2,7 @@
M: Jagan Teki <jagan@amarulasolutions.com>
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 2e99a59..ec0ad51 100644
--- a/board/engicam/imx8mm/MAINTAINERS
+++ b/board/engicam/imx8mm/MAINTAINERS
@@ -9,5 +9,6 @@
M: Matteo Lisi <matteo.lisi@engicam.com>
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 a25908a..c86f9bc 100644
--- a/board/engicam/imx8mp/MAINTAINERS
+++ b/board/engicam/imx8mp/MAINTAINERS
@@ -3,5 +3,6 @@
M: Matteo Lisi <matteo.lisi@engicam.com>
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 77f0c2d..99c5f28 100644
--- a/board/engicam/px30_core/MAINTAINERS
+++ b/board/engicam/px30_core/MAINTAINERS
@@ -15,5 +15,6 @@
M: Suniel Mahesh <sunil@amarulasolutions.com>
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 405ff99..4ba2a76 100644
--- a/board/engicam/stm32mp1/MAINTAINERS
+++ b/board/engicam/stm32mp1/MAINTAINERS
@@ -23,4 +23,5 @@
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/firefly/firefly-rk3308/MAINTAINERS b/board/firefly/firefly-rk3308/MAINTAINERS
index 1990797..e584038 100644
--- a/board/firefly/firefly-rk3308/MAINTAINERS
+++ b/board/firefly/firefly-rk3308/MAINTAINERS
@@ -1,5 +1,6 @@
ROC-RK3308-CC
M: Andy Yan <andy.yan@rock-chips.com>
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/imx93_evk/MAINTAINERS b/board/freescale/imx93_evk/MAINTAINERS
index 8ca4646..34ba278 100644
--- a/board/freescale/imx93_evk/MAINTAINERS
+++ b/board/freescale/imx93_evk/MAINTAINERS
@@ -4,4 +4,4 @@
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
diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS
index 36e7331..8e14ba3 100644
--- a/board/freescale/ls1043ardb/MAINTAINERS
+++ b/board/freescale/ls1043ardb/MAINTAINERS
@@ -3,7 +3,6 @@
M: Rajesh Bhagat <rajesh.bhagat@nxp.com>
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/gdsys/a38x/MAINTAINERS b/board/gdsys/a38x/MAINTAINERS
index 6492e79..bd81720 100644
--- a/board/gdsys/a38x/MAINTAINERS
+++ b/board/gdsys/a38x/MAINTAINERS
@@ -2,5 +2,6 @@
M: Mario Six <mario.six@gdsys.cc>
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 57faba4..514cde5 100644
--- a/board/gdsys/mpc8308/MAINTAINERS
+++ b/board/gdsys/mpc8308/MAINTAINERS
@@ -2,5 +2,6 @@
M: Mario Six <mario.six@gdsys.cc>
S: Maintained
F: board/gdsys/mpc8308/
+F: board/gdsys/common/
F: include/configs/gazerbeam.h
F: configs/gazerbeam_defconfig
diff --git a/board/google/chromebox_panther/MAINTAINERS b/board/google/chromebox_panther/MAINTAINERS
index c88774b..4963a89 100644
--- a/board/google/chromebox_panther/MAINTAINERS
+++ b/board/google/chromebox_panther/MAINTAINERS
@@ -1,6 +1,6 @@
CHROMEBOX PANTHER BOARD
M: Simon Glass <sjg@chromium.org>
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 eab622a..4d4c6e8 100644
--- a/board/hardkernel/odroid_go2/MAINTAINERS
+++ b/board/hardkernel/odroid_go2/MAINTAINERS
@@ -1,6 +1,6 @@
GO2
M: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
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/k+p/kp_imx53/MAINTAINERS b/board/k+p/kp_imx53/MAINTAINERS
index c105a93..daf8611 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 <lukma@denx.de>
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 6c4c8dd..e54f460 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 <lukma@denx.de>
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/keymile/km83xx/MAINTAINERS b/board/keymile/km83xx/MAINTAINERS
index ac1f8cb..8822e5d 100644
--- a/board/keymile/km83xx/MAINTAINERS
+++ b/board/keymile/km83xx/MAINTAINERS
@@ -3,6 +3,8 @@
M: Heiko Schocher <hs@denx.de>
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 1426475..1026188 100644
--- a/board/keymile/kmcent2/MAINTAINERS
+++ b/board/keymile/kmcent2/MAINTAINERS
@@ -2,6 +2,8 @@
M: Niel Fourie <lusus@denx.de>
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 33db2b2..ed5baf2 100644
--- a/board/keymile/pg-wcom-ls102xa/MAINTAINERS
+++ b/board/keymile/pg-wcom-ls102xa/MAINTAINERS
@@ -3,6 +3,8 @@
M: Rainer Boschung <rainer.boschung@hitachienergy.com>
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 833b3fd..e441f25 100644
--- a/board/keymile/secu1/MAINTAINERS
+++ b/board/keymile/secu1/MAINTAINERS
@@ -1,5 +1,8 @@
Hitachi Power Grids SECU1 BOARD
M: Holger Brunck <holger.brunck@hitachienergy.com>
S: Maintained
+F: board/keymile/secu1/
+F: board/keymile/common/
+F: board/keymile/scripts/
F: include/configs/socfpga_arria5_secu1.h
F: configs/socfpga_secu1_defconfig
diff --git a/board/l+g/vinco/MAINTAINERS b/board/l+g/vinco/MAINTAINERS
index 0cd6044..14b76b1 100644
--- a/board/l+g/vinco/MAINTAINERS
+++ b/board/l+g/vinco/MAINTAINERS
@@ -1,6 +1,6 @@
VInCo Platform
M: Gregory CLEMENT <gregory.clement@free-electrons.com>
S: Maintained
-F: board/l+g/vinco
+F: board/l\+g/vinco/
F: include/configs/vinco.h
F: configs/vinco_defconfig
diff --git a/board/pine64/pinebook-pro-rk3399/MAINTAINERS b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
index 227c1c0..7300ca1 100644
--- a/board/pine64/pinebook-pro-rk3399/MAINTAINERS
+++ b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
@@ -1,7 +1,7 @@
PINEBOOK_PRO
M: Peter Robinson <pbrobinson@gmail.com>
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 c923ff1..bc2dcdd 100644
--- a/board/pine64/pinephone-pro-rk3399/MAINTAINERS
+++ b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
@@ -1,7 +1,7 @@
PINEPHONE_PRO
M: Peter Robinson <pbrobinson@gmail.com>
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/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS
index 5be58f8..de1dc64 100644
--- a/board/rockchip/evb_rk3399/MAINTAINERS
+++ b/board/rockchip/evb_rk3399/MAINTAINERS
@@ -80,6 +80,12 @@
F: arch/arm/dts/rk3399-u-boot.dtsi
F: arch/arm/dts/rk3399-orangepi-u-boot.dtsi
+RADXA ROCK 4C+
+M: FUKAUMI Naoki <naoki@radxa.com>
+S: Maintained
+F: configs/rock-4c-plus-rk3399_defconfig
+F: arch/arm/dts/rk3399-rock-4c-plus.dts
+
ROCK-PI-4
M: Akash Gajjar <akash@openedev.com>
M: Jagan Teki <jagan@amarulasolutions.com>
diff --git a/board/ronetix/imx7-cm/MAINTAINERS b/board/ronetix/imx7-cm/MAINTAINERS
index 184c887..158c2b7 100644
--- a/board/ronetix/imx7-cm/MAINTAINERS
+++ b/board/ronetix/imx7-cm/MAINTAINERS
@@ -1,6 +1,6 @@
i.MX7-CM BOARD
M: Ilko Iliev <iliev@ronetix.com>
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 c6a915c..ddf4984 100644
--- a/board/seeed/npi_imx6ull/MAINTAINERS
+++ b/board/seeed/npi_imx6ull/MAINTAINERS
@@ -4,6 +4,6 @@
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/siemens/iot2050/MAINTAINERS b/board/siemens/iot2050/MAINTAINERS
index 1b52535..aa21de2 100644
--- a/board/siemens/iot2050/MAINTAINERS
+++ b/board/siemens/iot2050/MAINTAINERS
@@ -4,6 +4,7 @@
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/softing/vining_fpga/MAINTAINERS b/board/softing/vining_fpga/MAINTAINERS
index c2002fe..ed44b09 100644
--- a/board/softing/vining_fpga/MAINTAINERS
+++ b/board/softing/vining_fpga/MAINTAINERS
@@ -1,5 +1,6 @@
VINING FPGA BOARD
M: Marek Vasut <marex@denx.de>
S: Maintained
+F: board/softing/vining_fpga/
F: include/configs/socfpga_vining_fpga.h
F: configs/socfpga_vining_fpga_defconfig
diff --git a/board/solidrun/clearfog/MAINTAINERS b/board/solidrun/clearfog/MAINTAINERS
index 6646d96..6b2d5d1 100644
--- a/board/solidrun/clearfog/MAINTAINERS
+++ b/board/solidrun/clearfog/MAINTAINERS
@@ -1,7 +1,9 @@
CLEARFOG BOARD
M: Stefan Roese <sr@denx.de>
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
+F: configs/clearfog_sata_defconfig
+F: configs/clearfog_spi_defconfig
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 80e3f4b..98bbd2d 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -211,6 +211,11 @@
S: Maintained
F: configs/emlid_neutis_n5_devboard_defconfig
+LCTECH PI F1C200S
+M: Andre Przywara <andre.przywara@arm.com>
+S: Maintained
+F: configs/lctech_pi_f1c200s_defconfig
+
GEMEI-G9 TABLET
M: Priit Laes <plaes@plaes.org>
S: Maintained
diff --git a/board/terasic/de0-nano-soc/MAINTAINERS b/board/terasic/de0-nano-soc/MAINTAINERS
index 7f4cf1e..6ffa0c0 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 <dinguyen@kernel.org>
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 bd7a8d5..1e726e9 100644
--- a/board/terasic/de1-soc/MAINTAINERS
+++ b/board/terasic/de1-soc/MAINTAINERS
@@ -1,5 +1,6 @@
DE1-SoC BOARD
M: Anatolij Gustschin <agust@denx.de>
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 f4dd0df..ebfd3b2 100644
--- a/board/terasic/de10-nano/MAINTAINERS
+++ b/board/terasic/de10-nano/MAINTAINERS
@@ -1,5 +1,6 @@
DE10-NANO BOARD
M: Dalon Westergreen <dwesterg@gmail.com>
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 94bf1e0..49fdc75 100644
--- a/board/terasic/de10-standard/MAINTAINERS
+++ b/board/terasic/de10-standard/MAINTAINERS
@@ -1,5 +1,6 @@
DE10-STANDARD BOARD
M: Humberto Naves <hsnaves@gmail.com>
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 792f184..e301751 100644
--- a/board/terasic/sockit/MAINTAINERS
+++ b/board/terasic/sockit/MAINTAINERS
@@ -1,5 +1,6 @@
SOCKIT BOARD
M: Marek Vasut <marex@denx.de>
S: Maintained
+F: board/terasic/sockit/
F: include/configs/socfpga_sockit.h
F: configs/socfpga_sockit_defconfig
diff --git a/board/ti/ks2_evm/MAINTAINERS b/board/ti/ks2_evm/MAINTAINERS
index 999ef0a..637feec 100644
--- a/board/ti/ks2_evm/MAINTAINERS
+++ b/board/ti/ks2_evm/MAINTAINERS
@@ -1,12 +1,9 @@
-KS2_EVM BOARD
-M: Vitaly Andrianov <vitalya@ti.com>
+KeyStone II EVM Boards
+M: Andrew Davis <afd@ti.com>
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
diff --git a/board/toradex/apalis-imx8/MAINTAINERS b/board/toradex/apalis-imx8/MAINTAINERS
index 03b0fda..198399c 100644
--- a/board/toradex/apalis-imx8/MAINTAINERS
+++ b/board/toradex/apalis-imx8/MAINTAINERS
@@ -5,6 +5,7 @@
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 3c908e1..e2c6f63 100644
--- a/board/toradex/apalis-tk1/MAINTAINERS
+++ b/board/toradex/apalis-tk1/MAINTAINERS
@@ -2,6 +2,7 @@
M: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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 9c36ae1..0b2907b 100644
--- a/board/toradex/apalis_imx6/MAINTAINERS
+++ b/board/toradex/apalis_imx6/MAINTAINERS
@@ -7,5 +7,6 @@
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 01bc73e..097db7d 100644
--- a/board/toradex/apalis_t30/MAINTAINERS
+++ b/board/toradex/apalis_t30/MAINTAINERS
@@ -2,6 +2,7 @@
M: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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 37c485a..ee6fe6c 100644
--- a/board/toradex/colibri-imx6ull/MAINTAINERS
+++ b/board/toradex/colibri-imx6ull/MAINTAINERS
@@ -11,6 +11,7 @@
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 de62f87..8c9bf1f 100644
--- a/board/toradex/colibri-imx8x/MAINTAINERS
+++ b/board/toradex/colibri-imx8x/MAINTAINERS
@@ -5,6 +5,7 @@
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 f7a5ad5..25d3a06 100644
--- a/board/toradex/colibri_imx6/MAINTAINERS
+++ b/board/toradex/colibri_imx6/MAINTAINERS
@@ -4,6 +4,7 @@
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 513679a..e4583d5 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-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 77c2fc3..d0c5b11 100644
--- a/board/toradex/colibri_t20/MAINTAINERS
+++ b/board/toradex/colibri_t20/MAINTAINERS
@@ -2,6 +2,7 @@
M: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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 c2d6587..006a0e5 100644
--- a/board/toradex/colibri_t30/MAINTAINERS
+++ b/board/toradex/colibri_t30/MAINTAINERS
@@ -2,6 +2,7 @@
M: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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 f821a33..2e1a74c 100644
--- a/board/toradex/colibri_vf/MAINTAINERS
+++ b/board/toradex/colibri_vf/MAINTAINERS
@@ -8,5 +8,6 @@
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 b0f4329..8217bbc 100644
--- a/board/toradex/verdin-imx8mm/MAINTAINERS
+++ b/board/toradex/verdin-imx8mm/MAINTAINERS
@@ -8,6 +8,7 @@
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 ea04a83..85d6be8 100644
--- a/board/toradex/verdin-imx8mp/MAINTAINERS
+++ b/board/toradex/verdin-imx8mp/MAINTAINERS
@@ -5,6 +5,7 @@
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
diff --git a/board/vamrs/rock960_rk3399/MAINTAINERS b/board/vamrs/rock960_rk3399/MAINTAINERS
index 5ee5256..8821672 100644
--- a/board/vamrs/rock960_rk3399/MAINTAINERS
+++ b/board/vamrs/rock960_rk3399/MAINTAINERS
@@ -1,7 +1,7 @@
ROCK960-RK3399
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
S: Maintained
-F: board/rockchip/rock960_rk3399
+F: board/vamrs/rock960_rk3399/
F: include/configs/rock960_rk3399.h
F: configs/rock960-rk3399_defconfig
diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile
deleted file mode 100644
index b00accc..0000000
--- 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 053b07a..0000000
--- 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 <common.h>
-#include <env.h>
-#include "fsl_8xxx_misc.h"
-#include <init.h>
-
-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 c36b2af..0000000
--- 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 <common.h>
-#include <clock_legacy.h>
-#include <asm/io.h>
-
-/*
- * 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 bc7e5c5..0000000
--- 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 <common.h>
-#include <asm/mmu.h>
-#ifdef CONFIG_PCA953X
-#include <pca953x.h>
-
-/*
- * 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 6e4858f..0000000
--- 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__ */
diff --git a/disk/part.c b/disk/part.c
index 0a03b82..186ee96 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -670,8 +670,8 @@
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 @@
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/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 9d25c40..060918e 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -19,8 +19,6 @@
#include <linux/compat.h>
#include <android_image.h>
-#define FASTBOOT_MAX_BLK_WRITE 16384
-
#define BOOT_PARTITION_NAME "boot"
struct fb_mmc_sparse {
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index 6b36986..397dc0d 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -180,63 +180,71 @@
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 @@
{ /* 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,
};
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index a862e55..8158084 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -94,11 +94,6 @@
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 @@
/* 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);
diff --git a/drivers/rtc/max313xx.c b/drivers/rtc/max313xx.c
index 748f3c4..6040023 100644
--- a/drivers/rtc/max313xx.c
+++ b/drivers/rtc/max313xx.c
@@ -326,10 +326,22 @@
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)
diff --git a/include/image-sparse.h b/include/image-sparse.h
index 0572dbd..282a0b2 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -7,6 +7,8 @@
#include <part.h>
#include <sparse_format.h>
+#define FASTBOOT_MAX_BLK_WRITE 16384
+
#define ROUNDUP(x, y) (((x) + ((y) - 1)) & ~((y) - 1))
struct sparse_storage {
diff --git a/include/linux/types.h b/include/linux/types.h
index baa2c49..9df930a 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -65,7 +65,7 @@
#ifndef _TIME_T
#define _TIME_T
-typedef __kernel_time_t time_t;
+typedef long long time_t;
#endif
#ifndef _CLOCK_T
diff --git a/include/part.h b/include/part.h
index b19b33a..edc46f8 100644
--- a/include/part.h
+++ b/include/part.h
@@ -202,21 +202,6 @@
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 @@
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)
diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c
index cd5c3b6..4d0c8b8 100644
--- a/lib/fwu_updates/fwu.c
+++ b/lib/fwu_updates/fwu.c
@@ -95,6 +95,8 @@
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");
@@ -666,8 +668,6 @@
ret = fwu_set_active_index(boot_idx);
if (!ret)
boottime_check = 1;
-
- return 0;
}
if (efi_init_obj_list() != EFI_SUCCESS)
diff --git a/lib/fwu_updates/fwu_mtd.c b/lib/fwu_updates/fwu_mtd.c
index b73111a..69cd3d7 100644
--- a/lib/fwu_updates/fwu_mtd.c
+++ b/lib/fwu_updates/fwu_mtd.c
@@ -175,8 +175,10 @@
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;
}
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 5ec0f94..8f8a67e 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -55,7 +55,8 @@
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)) {