| Message ID | 20220122193819.84907-4-kettenis@openbsd.org |
|---|---|
| State | Accepted |
| Commit | a4bd5e4120d6389476c078076ce2746e3058037a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Apple M1 NVMe storage support | expand |
On Sat, 22 Jan 2022 at 12:38, Mark Kettenis <kettenis@openbsd.org> wrote: > > U-Boot is expected to support multiple generations of Apple SoCs > in a single binary with a single defconfig. Therefore it makes > more sense to set SYS_SOC to "apple". > > Signed-off-by: Mark Kettenis <kettenis@openbsd.org> > --- > arch/arm/include/asm/{arch-m1 => arch-apple}/uart.h | 0 > arch/arm/mach-apple/Kconfig | 2 +- > 2 files changed, 1 insertion(+), 1 deletion(-) > rename arch/arm/include/asm/{arch-m1 => arch-apple}/uart.h (100%) Reviewed-by: Simon Glass <sjg@chromium.org>
On Sat, Jan 22, 2022 at 08:38:13PM +0100, Mark Kettenis wrote: > U-Boot is expected to support multiple generations of Apple SoCs > in a single binary with a single defconfig. Therefore it makes > more sense to set SYS_SOC to "apple". > > Signed-off-by: Mark Kettenis <kettenis@openbsd.org> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/include/asm/arch-m1/uart.h b/arch/arm/include/asm/arch-apple/uart.h similarity index 100% rename from arch/arm/include/asm/arch-m1/uart.h rename to arch/arm/include/asm/arch-apple/uart.h diff --git a/arch/arm/mach-apple/Kconfig b/arch/arm/mach-apple/Kconfig index 80e8eb2307..75ee21e0f4 100644 --- a/arch/arm/mach-apple/Kconfig +++ b/arch/arm/mach-apple/Kconfig @@ -7,7 +7,7 @@ config SYS_CONFIG_NAME default "apple" config SYS_SOC - default "m1" + default "apple" config SYS_MALLOC_LEN default 0x4000000
U-Boot is expected to support multiple generations of Apple SoCs in a single binary with a single defconfig. Therefore it makes more sense to set SYS_SOC to "apple". Signed-off-by: Mark Kettenis <kettenis@openbsd.org> --- arch/arm/include/asm/{arch-m1 => arch-apple}/uart.h | 0 arch/arm/mach-apple/Kconfig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/include/asm/{arch-m1 => arch-apple}/uart.h (100%)