September 2023 - U-Boot

[PATCH v3] imx: syscounter: allow timer_init for SPL build
by Oleksandr Suvorov 16 Oct '23

16 Oct '23

From: Michael Scott <mike(a)foundries.io> With enabled SKIP_LOWLEVEL_INIT, the weak function timer_init() is used in the SPL build. For iMX6 SoC, this leads MMC to fail once u-boot proper is booted due to a timing issue. Always use iMX-specific timer_init() in SPL to fix timing issues. Fixes: be277c3a89 ("imx: mx7: avoid some initialization if low level is skipped") Signed-off-by: Michael Scott <mike(a)foundries.io> Co-developed-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> Reviewed-by: Peng Fan <peng.fan(a)nxp.com> --- Changes in v3: - add Reviewed-by from https://patchwork.ozlabs.org/project/uboot/patch/20210925151812.58480-1-ole… Changes in v2: - rebased on top of a2ac2b964b ("Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig") arch/arm/mach-imx/syscounter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index 129efac6fa6..16df1186759 100644 --- a/arch/arm/mach-imx/syscounter.c +++ b/arch/arm/mach-imx/syscounter.c @@ -59,7 +59,7 @@ static inline unsigned long long us_to_tick(unsigned long long usec) return usec; } -#if !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT) +#if !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT) || IS_ENABLED(CONFIG_SPL_BUILD) int timer_init(void) { struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR; -- 2.40.1

2 1

[PATCH 1/6] board: gateworks: venice: fix gw7904
by Tim Harvey 16 Oct '23

16 Oct '23

Add missing imx8mm-venice-gw7904 to CONFIG_OF_LIST Fixes commit 61e7f9732565 ("board: gateworks: venice: add imx8mm-gw7904 support") Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- configs/imx8mm_venice_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig index a485910a5299..4fba8eb2438b 100644 --- a/configs/imx8mm_venice_defconfig +++ b/configs/imx8mm_venice_defconfig @@ -75,7 +75,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902 imx8mm-venice-gw7903" +CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902 imx8mm-venice-gw7903 imx8mm-venice-gw7904" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_MMC_ENV_DEV=2 -- 2.25.1

2 11

[PATCH resend 0/2] imx: spl_imx_romapi: simplify stream loading
by Rasmus Villemoes 16 Oct '23

16 Oct '23

This is essentially a resend of something I sent four months ago [1]. The patches themselves are unchanged, but the commit log for 1/2 is updated to reflect the change wrt. IMX_HAB. Moreover, while they were previously "merely" a simplification, they are now required for making usb loading with IMX_HAB actually work. [1] https://lore.kernel.org/u-boot/20230523113651.292806-1-rasmus.villemoes@pre… Rasmus Villemoes (2): imx: spl_imx_romapi: avoid tricky use of spl_load_simple_fit() to get full FIT size imx: spl_imx_romapi.c: remove dead code arch/arm/mach-imx/spl_imx_romapi.c | 75 +++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 23 deletions(-) -- 2.37.2

3 6

[PATCH v2] arm: dts: imx8m: move CAAM nodes into common u-boot.dtsi
by Tim Harvey 16 Oct '23

16 Oct '23

Move the crypto and sec_jr* nodes from board-specific u-boot.dtsi files into the common files. Additionally protect the nodes with ifdef CONFIG_FSL_CAAM as they don't serve any purpose if that is not enabled. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- v2: - fix invalid ifdef - add rb tags from Fabio and Peng --- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 16 --------------- .../dts/imx8mm-kontron-bl-common-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mm-u-boot.dtsi | 20 +++++++++++++++++++ arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mn-u-boot.dtsi | 20 +++++++++++++++++++ arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 16 --------------- .../imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mp-u-boot.dtsi | 20 +++++++++++++++++++ .../dts/imx8mp-verdin-wifi-dev-u-boot.dtsi | 16 --------------- 10 files changed, 60 insertions(+), 112 deletions(-) diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index 155670da18d1..9a5b0795133b 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -65,22 +65,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &usbmisc1 { bootph-pre-ram; }; diff --git a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi index 1ad9d49a1118..ae542fdcffad 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi @@ -18,22 +18,6 @@ }; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &i2c1 { bootph-pre-ram; bootph-all; diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index a843bb851eaf..0bd7ad980b66 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -18,6 +18,12 @@ #endif }; +#ifdef CONFIG_FSL_CAAM +&crypto { + bootph-pre-ram; +}; +#endif + &soc { bootph-all; bootph-pre-ram; @@ -216,6 +222,20 @@ bootph-pre-ram; }; +#ifdef CONFIG_FSL_CAAM +&sec_jr0 { + bootph-pre-ram; +}; + +&sec_jr1 { + bootph-pre-ram; +}; + +&sec_jr2 { + bootph-pre-ram; +}; +#endif + &spba1 { bootph-all; bootph-pre-ram; diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 315714f39848..c31f3dec3de4 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -57,22 +57,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &usdhc1 { bootph-pre-ram; }; diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 86c9a6cd67f0..3a9e4c16281e 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -54,6 +54,12 @@ /delete-property/ assigned-clock-rates; }; +#ifdef CONFIG_FSL_CAAM +&crypto { + bootph-pre-ram; +}; +#endif + &iomuxc { bootph-pre-ram; }; @@ -63,6 +69,20 @@ bootph-all; }; +#ifdef CONFIG_FSL_CAAM +&sec_jr0 { + bootph-pre-ram; +}; + +&sec_jr1 { + bootph-pre-ram; +}; + +&sec_jr2 { + bootph-pre-ram; +}; +#endif + &spba1 { bootph-pre-ram; }; diff --git a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi index c69f7c9c32c0..393fd8ec2e5b 100644 --- a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi @@ -21,10 +21,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - &eqos { /delete-property/ assigned-clocks; /delete-property/ assigned-clock-parents; @@ -131,18 +127,6 @@ u-boot,off-on-delay-us = <20000>; }; -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &tpm { compatible = "tcg,tpm_tis-spi"; }; diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index 17965c58ba10..6d9b229989ac 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -65,22 +65,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &i2c1 { bootph-pre-ram; }; diff --git a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi index fe20938af536..cf2a87a9b903 100644 --- a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi @@ -62,22 +62,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &i2c1 { bootph-pre-ram; }; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index b2f213e3e706..afaf64ee9cd8 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -19,6 +19,12 @@ #endif }; +#ifdef CONFIG_FSL_CAAM +&crypto { + bootph-pre-ram; +}; +#endif + &soc { bootph-all; bootph-pre-ram; @@ -62,6 +68,20 @@ bootph-pre-ram; }; +#ifdef CONFIG_FSL_CAAM +&sec_jr0 { + bootph-pre-ram; +}; + +&sec_jr1 { + bootph-pre-ram; +}; + +&sec_jr2 { + bootph-pre-ram; +}; +#endif + &binman { u-boot-spl-ddr { filename = "u-boot-spl-ddr.bin"; diff --git a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi index fc87d3f4035b..2a1aa1935a76 100644 --- a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi @@ -28,10 +28,6 @@ }; -&crypto { - bootph-pre-ram; -}; - &gpio1 { bootph-pre-ram; }; @@ -140,18 +136,6 @@ bootph-pre-ram; }; -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &uart3 { bootph-pre-ram; }; -- 2.25.1

3 2

[PATCH] imx: hab: Use CONFIG_SPL_LOAD_FIT_ADDRESS in the CSF example
by Marek Vasut 16 Oct '23

16 Oct '23

The SPL authenticates image starting from CONFIG_SPL_LOAD_FIT_ADDRESS address, update the csf_fit.txt to match. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Fabio Estevam <festevam(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> --- doc/imx/habv4/csf_examples/mx8m/csf_fit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/imx/habv4/csf_examples/mx8m/csf_fit.txt b/doc/imx/habv4/csf_examples/mx8m/csf_fit.txt index 3d79edf2813..97f3eea573b 100644 --- a/doc/imx/habv4/csf_examples/mx8m/csf_fit.txt +++ b/doc/imx/habv4/csf_examples/mx8m/csf_fit.txt @@ -27,4 +27,4 @@ Verification index = 2 # FIXME: # Line 1 -- fitImage - Blocks = 0x401fcdc0 0x57c00 0xffff "flash.bin" + Blocks = CONFIG_SPL_LOAD_FIT_ADDRESS 0x57c00 0xffff "flash.bin" -- 2.40.1

3 2

[PATCH] verdin-imx8mp: drop unused tdx easy installer ifdef
by Hiago De Franco 16 Oct '23

16 Oct '23

From: Hiago De Franco <hiago.franco(a)toradex.com> Drop unused code related to CONFIG_TDX_EASY_INSTALLER, that existed only on toradex downstream branch. Signed-off-by: Hiago De Franco <hiago.franco(a)toradex.com> --- include/configs/verdin-imx8mp.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 942081ab84..d980bd66ae 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -36,20 +36,14 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#if defined(CONFIG_TDX_EASY_INSTALLER) -# define BOOT_SCRIPT "boot-tezi.scr" -#else -# define BOOT_SCRIPT "boot.scr" -#endif - /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ "boot_file=Image\0" \ - "boot_scripts=" BOOT_SCRIPT "\0" \ - "boot_script_dhcp=" BOOT_SCRIPT "\0" \ + "boot_scripts=boot.scr\0" \ + "boot_script_dhcp=boot.scr\0" \ "console=ttymxc2\0" \ "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ -- 2.40.1

4 3

[PATCH] arm: kirkwood: Pogo v4: Enable LTO
by Tony Dinh 16 Oct '23

16 Oct '23

Enable building Pogo V4 u-boot image with LTO, which results in about 30K reduction in size. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- configs/pogo_v4_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 3e3e811543..ad36da712b 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogoplug-series-4" CONFIG_SYS_PROMPT="Pogo_V4> " CONFIG_IDENT_STRING="\nPogoplug V4" CONFIG_SYS_LOAD_ADDR=0x800000 +CONFIG_LTO=y CONFIG_PCI=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTSTAGE=y -- 2.39.2

2 2

[PATCH 0/4] firmware: scmi: add SCMI power domain protocol support
by AKASHI Takahiro 16 Oct '23

16 Oct '23

This patch series allows users to access SCMI power domain protocol provided by SCMI server (platform). See SCMI specification document v3.2 beta 2[1] for more details about SCMI power domain protocol. The implementation consists of two layers: - basic helper functions for SCMI power domain protocol in drivers/firmware/scmi/pwdom.c (patch#1) - DM-compliant power domain driver, which utilizes the helper functions, in drivers/power/domain/scmi-power-domain.c (patch#2) [1] https://developer.arm.com/documentation/den0056/e/?lang=en DT bindings =========== Standard bindings are applied, i.e. scmi { ... pwrdom_scmi: protocol@11 { regs = <0x11>; #power-domain-cells = <1>; } ... } som-device { ... power-domains = <&pwrdom_scmi 2>; } Test ==== The patch series was tested on the following platform: * sandbox ("ut dm scmi_power_domains") Prerequisite: ============= * This patch series is based on my "Base protocol support" patches[2] on v2023.10-rc4. [2] https://lists.denx.de/pipermail/u-boot/2023-September/531623.html Patches: ======== Patch#1: Add SCMI power domain protocol helpers Patch#2: Add power domain driver Patch#3-#4: Test related Change history: =============== RFC (Sep 26, 2023) * initial release AKASHI Takahiro (4): firmware: scmi: add power domain protocol support power: domain: add SCMI driver sandbox: add SCMI power domain protocol support for testing test: dm: add SCMI power domain protocol test arch/sandbox/dts/test.dts | 6 + arch/sandbox/include/asm/scmi_test.h | 20 ++ configs/sandbox_defconfig | 1 + drivers/firmware/scmi/Makefile | 1 + drivers/firmware/scmi/pwdom.c | 189 +++++++++++++ drivers/firmware/scmi/sandbox-scmi_agent.c | 265 ++++++++++++++++++- drivers/firmware/scmi/sandbox-scmi_devices.c | 10 + drivers/firmware/scmi/scmi_agent-uclass.c | 11 + drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/scmi-power-domain.c | 197 ++++++++++++++ include/scmi_agent-uclass.h | 2 + include/scmi_protocols.h | 178 +++++++++++++ test/dm/scmi.c | 107 +++++++- 14 files changed, 993 insertions(+), 2 deletions(-) create mode 100644 drivers/firmware/scmi/pwdom.c create mode 100644 drivers/power/domain/scmi-power-domain.c -- 2.34.1

3 9

[PATCH] arm: mach-apple: Move M1/M2 specifics into a separate folder
by ivo.ivanov＠null.net 15 Oct '23

15 Oct '23

From: Ivaylo Ivanov <ivo.ivanov(a)null.net> Currently, mach-apple assumes we're working with M1/M2. Make room for adding support for other Apple SoCs by moving everything from the M1/M2 SoC family in "mach-apple/" into "mach-apple/m1/". Signed-off-by: Ivaylo Ivanov <ivo.ivanov(a)null.net> --- arch/arm/Kconfig | 29 -------------- arch/arm/mach-apple/Kconfig | 42 ++++++++++++++++++++ arch/arm/mach-apple/Makefile | 5 +-- arch/arm/mach-apple/m1/Makefile | 6 +++ arch/arm/mach-apple/{ => m1}/board.c | 0 arch/arm/mach-apple/{ => m1}/lowlevel_init.S | 0 arch/arm/mach-apple/{ => m1}/rtkit.c | 0 arch/arm/mach-apple/{ => m1}/sart.c | 0 configs/apple_m1_defconfig | 1 + 9 files changed, 50 insertions(+), 33 deletions(-) create mode 100644 arch/arm/mach-apple/m1/Makefile rename arch/arm/mach-apple/{ => m1}/board.c (100%) rename arch/arm/mach-apple/{ => m1}/lowlevel_init.S (100%) rename arch/arm/mach-apple/{ => m1}/rtkit.c (100%) rename arch/arm/mach-apple/{ => m1}/sart.c (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 97c25b4f14..5339da370c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -980,38 +980,9 @@ config ARCH_NPCM config ARCH_APPLE bool "Apple SoCs" - select ARM64 - select CLK - select CMD_PCI - select CMD_USB select DM - select DM_GPIO - select DM_KEYBOARD - select DM_MAILBOX select DM_RESET select DM_SERIAL - select DM_SPI - select DM_USB - select VIDEO - select IOMMU - select LINUX_KERNEL_IMAGE_HEADER - select OF_BOARD_SETUP - select OF_CONTROL - select PCI - select PINCTRL - select POSITION_INDEPENDENT - select POWER_DOMAIN - select REGMAP - select SPI - select SYSCON - select SYSRESET - select SYSRESET_WATCHDOG - select SYSRESET_WATCHDOG_AUTO - select USB - imply CMD_DM - imply CMD_GPT - imply DISTRO_DEFAULTS - imply OF_HAS_PRIOR_STAGE config ARCH_OWL bool "Actions Semi OWL SoCs" diff --git a/arch/arm/mach-apple/Kconfig b/arch/arm/mach-apple/Kconfig index 294690ec0e..a38779b387 100644 --- a/arch/arm/mach-apple/Kconfig +++ b/arch/arm/mach-apple/Kconfig @@ -3,6 +3,46 @@ if ARCH_APPLE config TEXT_BASE default 0x00000000 +choice + prompt "Apple Silicon architecture type select" + optional + +config ARCH_APPLE_M1 + bool "Apple M1/M2 SoC family" + select ARM64 + select CLK + select CMD_PCI + select CMD_USB + select DM_GPIO + select DM_KEYBOARD + select DM_MAILBOX + select DM_SPI + select DM_USB + select VIDEO + select IOMMU + select LINUX_KERNEL_IMAGE_HEADER + select OF_BOARD_SETUP + select OF_CONTROL + select PCI + select PINCTRL + select POSITION_INDEPENDENT + select POWER_DOMAIN + select REGMAP + select SPI + select SYSCON + select SYSRESET + select SYSRESET_WATCHDOG + select SYSRESET_WATCHDOG_AUTO + select USB + imply CMD_DM + imply CMD_GPT + imply DISTRO_DEFAULTS + imply OF_HAS_PRIOR_STAGE + +endchoice + +if ARCH_APPLE_M1 + config SYS_CONFIG_NAME default "apple" @@ -19,3 +59,5 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE default TEXT_BASE endif + +endif diff --git a/arch/arm/mach-apple/Makefile b/arch/arm/mach-apple/Makefile index 50b465b947..d147ccdde2 100644 --- a/arch/arm/mach-apple/Makefile +++ b/arch/arm/mach-apple/Makefile @@ -1,6 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-y += board.o -obj-y += lowlevel_init.o -obj-y += rtkit.o -obj-$(CONFIG_NVME_APPLE) += sart.o +obj-$(CONFIG_ARCH_APPLE_M1) += m1/ diff --git a/arch/arm/mach-apple/m1/Makefile b/arch/arm/mach-apple/m1/Makefile new file mode 100644 index 0000000000..50b465b947 --- /dev/null +++ b/arch/arm/mach-apple/m1/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-y += board.o +obj-y += lowlevel_init.o +obj-y += rtkit.o +obj-$(CONFIG_NVME_APPLE) += sart.o diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/m1/board.c similarity index 100% rename from arch/arm/mach-apple/board.c rename to arch/arm/mach-apple/m1/board.c diff --git a/arch/arm/mach-apple/lowlevel_init.S b/arch/arm/mach-apple/m1/lowlevel_init.S similarity index 100% rename from arch/arm/mach-apple/lowlevel_init.S rename to arch/arm/mach-apple/m1/lowlevel_init.S diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/m1/rtkit.c similarity index 100% rename from arch/arm/mach-apple/rtkit.c rename to arch/arm/mach-apple/m1/rtkit.c diff --git a/arch/arm/mach-apple/sart.c b/arch/arm/mach-apple/m1/sart.c similarity index 100% rename from arch/arm/mach-apple/sart.c rename to arch/arm/mach-apple/m1/sart.c diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index 755560971e..bd723881da 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_APPLE=y +CONFIG_ARCH_APPLE_M1=y CONFIG_DEFAULT_DEVICE_TREE="t8103-j274" CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_USE_PREBOOT=y -- 2.34.1

3 5

[RESEND PATCH v3 0/3] rpi: Convert to standard boot
by Simon Glass 15 Oct '23

15 Oct '23

This series moves Raspberry Pi boards over to use standard boot. It also moves rpi over to use a text-based environment. Unfortunately it is not possible to empty the header file due to several CFG options. Fix the repeated "and and" while we are here. Note that this reduces rodata size by about 4.5KB. We could get another for a total image-size saving of about 15KB. This is mostly because HUSH_PARSER is not enabled anymore and the environment shrinks down by about 3.5K. Hush is not actually needed anymore, since standard boot does not use it. Also CMD_SYSBOOT is dropped since standard boot calls the pxe_utils code directly in that case. Changes in v3: - Rebase to -master Changes in v2: - Rebase to -next - Add new patch to disable DISTRO_DEFAULTS Simon Glass (3): arm: rpi: Switch to standard boot rpi: Disable DISTRO_DEFAULTS arm: rpi: Switch to a text environment board/raspberrypi/rpi/rpi.env | 77 +++++++++++++++++++ configs/rpi_0_w_defconfig | 2 +- configs/rpi_2_defconfig | 2 +- configs/rpi_3_32b_defconfig | 2 +- configs/rpi_3_b_plus_defconfig | 2 +- configs/rpi_3_defconfig | 2 +- configs/rpi_4_32b_defconfig | 2 +- configs/rpi_4_defconfig | 2 +- configs/rpi_arm64_defconfig | 2 +- configs/rpi_defconfig | 2 +- include/configs/rpi.h | 134 --------------------------------- 11 files changed, 86 insertions(+), 143 deletions(-) create mode 100644 board/raspberrypi/rpi/rpi.env -- 2.41.0.487.g6d72f3e995-goog

2 13