Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 86ed4d2..5f73867 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -10,7 +10,6 @@
 #define __CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_SYS_THUMB_BUILD
 
 #undef CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
@@ -18,7 +17,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
@@ -34,8 +33,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * 1024 * 1024)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_MXC_UART
@@ -55,7 +52,6 @@
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* OCOTP Configs */
-#define CONFIG_CMD_FUSE
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 #endif
@@ -67,11 +63,7 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
 #define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FAT_WRITE
-#define CONFIG_DOS_PARTITION
 
 /* Network */
 #define CONFIG_FEC_MXC
@@ -108,7 +100,6 @@
 #define CONFIG_DFU_MMC
 
 /* Miscellaneous commands */
-#define CONFIG_CMD_BMODE
 #define CONFIG_MXC_GPIO
 
 /* Framebuffer and LCD */
@@ -122,16 +113,13 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_CMD_BMP
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                        115200
 
 /* Command definition */
 #undef CONFIG_CMD_LOADB
@@ -177,6 +165,7 @@
                "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #define MEM_LAYOUT_ENV_SETTINGS \
+       "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x12000000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
@@ -279,13 +268,9 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
+/* environment organization */
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 
-#define CONFIG_ENV_IS_IN_MMC
-
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
@@ -300,6 +285,4 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-#define CONFIG_CRC32_VERIFY
-
 #endif /* __CONFIG_H */