diff options
| author | Tom Rini <trini@konsulko.com> | 2023-12-13 09:57:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-13 09:57:28 -0500 |
| commit | 27089f1e4d11fd7e0619097b59258d0428cde2ac (patch) | |
| tree | e01a6ddf80543a02858261a769642573e67874b0 | |
| parent | 20d0464300c25db673cfb5e4539aa3767606d151 (diff) | |
| parent | 87635a4d6887e4393604743c4c2625053edc2ac4 (diff) | |
| download | u-boot-27089f1e4d11fd7e0619097b59258d0428cde2ac.zip u-boot-27089f1e4d11fd7e0619097b59258d0428cde2ac.tar.gz u-boot-27089f1e4d11fd7e0619097b59258d0428cde2ac.tar.bz2 | |
Merge branch '2023-12-13-assorted-minor-fixes'
- A few MAINTAINERS updates and Kconfig wording fixes
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | board/pine64/rockpro64_rk3399/MAINTAINERS | 1 | ||||
| -rw-r--r-- | board/rockchip/evb_rk3399/MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 2 | ||||
| -rw-r--r-- | lib/Kconfig | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9f74c0a..9695144 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,7 +117,7 @@ F: drivers/mmc/snps_dw_mmc.c APPLE M1 SOC SUPPORT M: Mark Kettenis <kettenis@openbsd.org> 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 @@ -1528,7 +1528,6 @@ F: cmd/stackprot_test.c F: test/py/tests/test_stackprotector.py TARGET_BCMNS3 -M: Bharat Gooty <bharat.gooty@broadcom.com> M: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> S: Maintained F: board/broadcom/bcmns3/ diff --git a/board/pine64/rockpro64_rk3399/MAINTAINERS b/board/pine64/rockpro64_rk3399/MAINTAINERS index 303db14..220ee21 100644 --- a/board/pine64/rockpro64_rk3399/MAINTAINERS +++ b/board/pine64/rockpro64_rk3399/MAINTAINERS @@ -1,5 +1,4 @@ ROCKPRO64 -M: Akash Gajjar <akash@openedev.com> M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained F: board/pine64/rockpro64_rk3399 diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index c7e412b..acdb840 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 <akash@openedev.com> M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained F: configs/rock-pi-4-rk3399_defconfig diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 97057de..ed7eced 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 diff --git a/lib/Kconfig b/lib/Kconfig index 1964951..d47df6b 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 |