global: Migrate CONFIG_STACKBASE to CFG

[platform/kernel/u-boot.git] / include / configs / imx6-engicam.h

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 9e20cfb..786b70f 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -24,7 +24,7 @@
 #endif
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "splashpos=m,m\0" \
        "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
@@ -109,21 +109,16 @@
 /* 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)
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* UART */
 #ifdef CONFIG_MXC_UART
 # ifdef CONFIG_MX6UL
-#  define CONFIG_MXC_UART_BASE         UART1_BASE
+#  define CFG_MXC_UART_BASE            UART1_BASE
 # else
-#  define CONFIG_MXC_UART_BASE         UART4_BASE
+#  define CFG_MXC_UART_BASE            UART4_BASE
 # endif
 #endif
 
@@ -131,36 +126,10 @@
 
 /* NAND */
 #ifdef CONFIG_NAND_MXS
-# define CONFIG_SYS_MAX_NAND_DEVICE    1
-# define CONFIG_SYS_NAND_BASE          0x40000000
-# define CONFIG_SYS_NAND_U_BOOT_START  CONFIG_SYS_TEXT_BASE
+# define CFG_SYS_NAND_BASE             0x40000000
+# define CFG_SYS_NAND_U_BOOT_START     CONFIG_TEXT_BASE
 
 /* MTD device */
 #endif
 
-/* Falcon Mode */
-#ifdef CONFIG_SPL_OS_BOOT
-# define CONFIG_SPL_FS_LOAD_ARGS_NAME  "args"
-# define CONFIG_SPL_FS_LOAD_KERNEL_NAME        "uImage"
-# define CONFIG_SYS_SPL_ARGS_ADDR      0x18000000
-
-/* 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)
-# define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR       0x1000  /* 2MB */
-#endif
-
-/* Framebuffer */
-#ifdef CONFIG_VIDEO_IPUV3
-# define CONFIG_IMX_VIDEO_SKIP
-
-# define CONFIG_VIDEO_LOGO
-# define CONFIG_VIDEO_BMP_LOGO
-#endif
-
-/* SPL */
-#ifdef CONFIG_SPL
-# include "imx6_spl.h"
-#endif
-
 #endif /* __IMX6_ENGICAM_CONFIG_H */