From 6fb4f7387e17664e2e6cea1217fe9e95cc0a1170 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Sat, 19 Feb 2022 14:05:19 +0100 Subject: arm: apple: Switch to fully dynamic mem layout Support for Apple M1 Pro and Max will allow using a single binary for all M1 SoCs. The M1 Pro/Max have a different memory layout. The RAM start address is 0x100_0000_0000 instead of 0x8_0000_0000. Replace the hardcoded memory layout with dynamic initialized environment variables in board_late_init(). Tested on Mac Mini (2020) and Macbook Pro 14-inch (2021). Signed-off-by: Janne Grunau Reviewed-by: Mark Kettenis --- include/configs/apple.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/configs/apple.h b/include/configs/apple.h index f12e9bdef5a..b06660add4f 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -9,10 +9,6 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#define ENV_MEM_LAYOUT_SETTINGS \ - "fdt_addr_r=0x960100000\0" \ - "kernel_addr_r=0x960200000\0" - #if CONFIG_IS_ENABLED(CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else @@ -33,7 +29,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif -- cgit v1.3.1