global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

[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 c4be62c..eee3d2d 100644 (file)
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -17,19 +17,16 @@
 /* RAM */
 #define PHYS_SDRAM                     DDR_CSD1_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        (SZ_4G)
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x200000
+#define CFG_SYS_INIT_RAM_ADDR  0x40000000
+#define CFG_SYS_INIT_RAM_SIZE  0x200000
 
 /* Board and environment settings */
-#define CONFIG_HOSTNAME                        "kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS           0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS              0
 #endif
 
 /* GUID for capsule updatable firmware image */
@@ -37,7 +34,6 @@
        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) \
        func(MMC, mmc, 0) \
@@ -47,31 +43,12 @@
 /* Do not try to probe USB net adapters for net boot */
 #undef BOOTENV_RUN_NET_USB_START
 #define BOOTENV_RUN_NET_USB_START
-#else
-#define BOOTENV
-#endif
-
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR           0x930000
+#define CFG_MALLOC_F_ADDR              0x930000
 #endif
 
-#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 \
-       "dfu_alt_info=sf 0:0=flash-bin raw 0x400 0x1f0000\0" \
-       "bootdelay=3\0" \
-       "hostname=" CONFIG_HOSTNAME "\0" \
-       ENV_MEM_LAYOUT_SETTINGS \
-       BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */