mach-imx: bootaux: fix building with disabled bootelf

[platform/kernel/u-boot.git] / configs / CMPCPRO_defconfig

diff --git a/configs/CMPCPRO_defconfig b/configs/CMPCPRO_defconfig
index 7313715..d817274 100644 (file)
--- a/configs/CMPCPRO_defconfig
+++ b/configs/CMPCPRO_defconfig
@@ -6,6 +6,7 @@ CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="cmpcpro"
 CONFIG_SYS_PROMPT="MPC_PRO> "
+CONFIG_SYS_MONITOR_LEN=393216
 CONFIG_SYS_CLK_FREQ=66666667
 CONFIG_ENV_ADDR=0x400e0000
 CONFIG_MPC83xx=y
@@ -21,7 +22,6 @@ CONFIG_BAT0_NAME="FLASH"
 CONFIG_BAT0_BASE=0x40000000
 CONFIG_BAT0_LENGTH_64_MBYTES=y
 CONFIG_BAT0_ACCESS_RW=y
-CONFIG_BAT0_ICACHE_WRITETHROUGH=y
 CONFIG_BAT0_DCACHE_WRITETHROUGH=y
 CONFIG_BAT0_USER_MODE_VALID=y
 CONFIG_BAT0_SUPERVISOR_MODE_VALID=y
@@ -43,7 +43,6 @@ CONFIG_BAT3=y
 CONFIG_BAT3_NAME="BCSR"
 CONFIG_BAT3_BASE=0xA0000000
 CONFIG_BAT3_ACCESS_RW=y
-CONFIG_BAT3_ICACHE_GUARDED=y
 CONFIG_BAT3_DCACHE_WRITETHROUGH=y
 CONFIG_BAT3_DCACHE_INHIBITED=y
 CONFIG_BAT3_DCACHE_GUARDED=y
@@ -53,7 +52,6 @@ CONFIG_BAT4_NAME="PERIPHETH"
 CONFIG_BAT4_BASE=0x90000000
 CONFIG_BAT4_LENGTH_64_MBYTES=y
 CONFIG_BAT4_ACCESS_RW=y
-CONFIG_BAT4_ICACHE_GUARDED=y
 CONFIG_BAT4_DCACHE_WRITETHROUGH=y
 CONFIG_BAT4_DCACHE_INHIBITED=y
 CONFIG_BAT4_DCACHE_GUARDED=y
@@ -63,7 +61,6 @@ CONFIG_BAT5_NAME="CARTEBASE"
 CONFIG_BAT5_BASE=0x80000000
 CONFIG_BAT5_LENGTH_64_MBYTES=y
 CONFIG_BAT5_ACCESS_RW=y
-CONFIG_BAT5_ICACHE_GUARDED=y
 CONFIG_BAT5_DCACHE_WRITETHROUGH=y
 CONFIG_BAT5_DCACHE_INHIBITED=y
 CONFIG_BAT5_DCACHE_GUARDED=y
@@ -73,7 +70,6 @@ CONFIG_BAT6_NAME="IMMRBAR"
 CONFIG_BAT6_BASE=0xB0000000
 CONFIG_BAT6_LENGTH_4_MBYTES=y
 CONFIG_BAT6_ACCESS_RW=y
-CONFIG_BAT6_ICACHE_GUARDED=y
 CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
@@ -105,7 +101,6 @@ CONFIG_ACR_RPTCNT_3=y
 CONFIG_SPCR_OPT_SPEC_READ=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
-CONFIG_SYS_MONITOR_LEN=393216
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
@@ -141,7 +136,6 @@ CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
-# CONFIG_CMD_NFS is not set
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_SLEEP is not set