From 253f939aa11cecde2aef632b528d550ca94630b4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 20 Nov 2023 15:17:23 -0500 Subject: [PATCH 1/5] lib/Kconfig: Correct typo about SYSINFO_SMBIOS in help message The correct symbol to enable to have SMBIOS populate fields based on the device tree is SYSINFO_SMBIOS and not SMBIOS_SYSINFO. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- lib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index 19649517a39..d47df6bb1cf 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -995,7 +995,7 @@ config GENERATE_SMBIOS_TABLE Check http://www.dmtf.org/standards/smbios for details. - See also SMBIOS_SYSINFO which allows SMBIOS values to be provided in + See also SYSINFO_SMBIOS which allows SMBIOS values to be provided in the devicetree. endmenu From b68d2865f1690a21bef70859d273b82b7341b7a9 Mon Sep 17 00:00:00 2001 From: Alexander Gendin Date: Mon, 20 Nov 2023 20:21:51 +0000 Subject: [PATCH 2/5] drivers: misc: Kconfig: Fix SPL_FS_LOADER prompt Both FS_LOADER and SPL_FS_LOADER have the same menu prompt. To avoid confusion, make prompt for SPL_FS_LOADER different. Signed-off-by: Alexander Gendin Reviewed-by: Simon Glass --- drivers/misc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 97057de8bf9..ed7ecedd3ac 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -615,7 +615,7 @@ config FS_LOADER ie. the FPGA device. config SPL_FS_LOADER - bool "Enable loader driver for file system" + bool "Enable loader driver for file system in SPL" depends on SPL help This is file system generic loader which can be used to load From c5e9a4166da82398835496b55fc57f31ae5ac3c5 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Wed, 22 Nov 2023 16:21:14 +0000 Subject: [PATCH 3/5] MAINTAINERS: Fix ARCH_APPLE file paths Fixes a filepath in MAINTAINERS file that wasn't updated when renaming the files to match the new SoC name. Fixes: a4bd5e4120d6 ('arm: apple: Change SoC name from "m1" into "apple"') Signed-off-by: Moritz Fischer --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9f74c0aacaa..f0411ed807f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,7 +117,7 @@ F: drivers/mmc/snps_dw_mmc.c APPLE M1 SOC SUPPORT M: Mark Kettenis S: Maintained -F: arch/arm/include/asm/arch-m1/ +F: arch/arm/include/asm/arch-apple/ F: arch/arm/mach-apple/ F: configs/apple_m1_defconfig F: drivers/iommu/apple_dart.c From dcb014b61fe2fefd2bec9b0f171d8ad40e8ed939 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 5 Dec 2023 09:12:22 +0000 Subject: [PATCH 4/5] maintainers: bcmns3: remove maintainer Remove Bharat Gooty as a maintainer as his mail is bouncing. Signed-off-by: Peter Robinson Cc: Rayagonda Kokatanur --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f0411ed807f..969514468cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1528,7 +1528,6 @@ F: cmd/stackprot_test.c F: test/py/tests/test_stackprotector.py TARGET_BCMNS3 -M: Bharat Gooty M: Rayagonda Kokatanur S: Maintained F: board/broadcom/bcmns3/ From 87635a4d6887e4393604743c4c2625053edc2ac4 Mon Sep 17 00:00:00 2001 From: Shantur Rathore Date: Fri, 24 Nov 2023 12:04:31 +0000 Subject: [PATCH 5/5] maintainers: rk3399: remove maintainer Remove Akash Gajjar from MAINTAINERS as email is bouncing. Signed-off-by: Shantur Rathore Reviewed-by: Kever Yang --- board/pine64/rockpro64_rk3399/MAINTAINERS | 1 - board/rockchip/evb_rk3399/MAINTAINERS | 1 - 2 files changed, 2 deletions(-) diff --git a/board/pine64/rockpro64_rk3399/MAINTAINERS b/board/pine64/rockpro64_rk3399/MAINTAINERS index 303db144aab..220ee21f230 100644 --- a/board/pine64/rockpro64_rk3399/MAINTAINERS +++ b/board/pine64/rockpro64_rk3399/MAINTAINERS @@ -1,5 +1,4 @@ ROCKPRO64 -M: Akash Gajjar M: Jagan Teki S: Maintained F: board/pine64/rockpro64_rk3399 diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index c7e412b54ee..acdb840f209 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -93,7 +93,6 @@ F: configs/rock-4se-rk3399_defconfig F: arch/arm/dts/rk3399-rock-4se-u-boot.dtsi ROCK-PI-4 -M: Akash Gajjar M: Jagan Teki S: Maintained F: configs/rock-pi-4-rk3399_defconfig