global: Migrate CONFIG_STACKBASE to CFG

[platform/kernel/u-boot.git] / include / configs / imx6dl-mamoj.h

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 85ca897..6c61b3f 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -20,8 +20,7 @@
 /* Environment in MMC */
 #endif
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "scriptaddr=0x14000000\0"       \
        "fdt_addr_r=0x13000000\0"       \
        "kernel_addr_r=0x10008000\0"    \
@@ -34,44 +33,30 @@
        func(MMC, mmc, 2)
 
 #include <config_distro_bootcmd.h>
-#endif
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART3_BASE
+#define CFG_MXC_UART_BASE              UART3_BASE
 
 /* MMC */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 
 /* USB */
-#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
 
 /* Falcon */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x13000000
 
 /* MMC support: args@1MB kernel@2MB */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR          0x800   /* 1MB */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS         (CONFIG_CMD_SPL_WRITE_SIZE / 512)
 
 /* Miscellaneous configurable options */
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
-
-#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)
-
-/* SPL */
-#include "imx6_spl.h"
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 #endif /* __IMX6DL_MAMOJ_CONFIG_H */