Convert CONFIG_SPL_STACK to Kconfig

[platform/kernel/u-boot.git] / include / configs / kontron-sl-mx8mm.h

diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index d1e87f9..b2c826b 100644 (file)
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -22,13 +22,8 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x200000
 
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
 /* Board and environment settings */
-#define CONFIG_MXC_UART_BASE           UART3_BASE_ADDR
+#define CONFIG_MXC_UART_BASE           UART_BASE_ADDR(3)
 #define CONFIG_HOSTNAME                        "kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
@@ -38,6 +33,11 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
+/* GUID for capsule updatable firmware image */
+#define KONTRON_SL_MX8MM_FIT_IMAGE_GUID \
+       EFI_GUID(0xd488e45a, 0x4929, 0x4b55, 0x8c, 0x14, \
+                0x86, 0xce, 0xa2, 0xcd, 0x66, 0x29)
+
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \
@@ -53,29 +53,29 @@
 #endif
 
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M
-#define CONFIG_SPL_MAX_SIZE            (148 * SZ_1K)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SPL_STACK               0x91fff0
 #define CONFIG_SPL_BSS_START_ADDR      0x910000
-#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K
 #define CONFIG_SYS_SPL_MALLOC_START    0x42200000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_512K
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CONFIG_MALLOC_F_ADDR           0x930000
 #endif
 
-#define FEC_QUIRK_ENET_MAC
+#define ENV_MEM_LAYOUT_SETTINGS \
+       "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "kernel_addr_r=0x42000000\0" \
+       "fdt_addr_r=0x48000000\0" \
+       "fdtoverlay_addr_r=0x49000000\0" \
+       "ramdisk_addr_r=0x48080000\0" \
+       "scriptaddr=0x40000000\0"\
+       "pxefile_addr_r=0x40100000\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "kernel_addr_r=0x42000000\0" \
-       "fdt_addr_r=0x44000000\0" \
-       "ramdisk_addr_r=0x46400000\0" \
-       "pxefile_addr_r=0x46000000\0" \
-       "scriptaddr=0x46000000\0" \
        "dfu_alt_info=sf 0:0=flash-bin raw 0x400 0x1f0000\0" \
        "bootdelay=3\0" \
        "hostname=" CONFIG_HOSTNAME "\0" \
+       ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */