Merge branch 'master' into next

[u-boot.git] / configs / tuge1_defconfig

diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 6df74b50771b931f10a563a164634ebd0e15c086..c10b5c20a73c351fc854512e1ee621cbd9d10e7d 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_TEXT_BASE=0xF0000000
+CONFIG_ENV_SOURCE_FILE="km83xx"
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DEFAULT_DEVICE_TREE="kmtuge1"
@@ -21,7 +22,6 @@ CONFIG_BAT0_BASE=0x00000000
 CONFIG_BAT0_LENGTH_256_MBYTES=y
 CONFIG_BAT0_ACCESS_RW=y
 CONFIG_BAT0_ICACHE_INHIBITED=y
-CONFIG_BAT0_ICACHE_GUARDED=y
 CONFIG_BAT0_DCACHE_INHIBITED=y
 CONFIG_BAT0_DCACHE_GUARDED=y
 CONFIG_BAT0_USER_MODE_VALID=y
@@ -32,7 +32,6 @@ CONFIG_BAT1_BASE=0xE0000000
 CONFIG_BAT1_LENGTH_4_MBYTES=y
 CONFIG_BAT1_ACCESS_RW=y
 CONFIG_BAT1_ICACHE_INHIBITED=y
-CONFIG_BAT1_ICACHE_GUARDED=y
 CONFIG_BAT1_DCACHE_INHIBITED=y
 CONFIG_BAT1_DCACHE_GUARDED=y
 CONFIG_BAT1_USER_MODE_VALID=y
@@ -95,6 +94,7 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
 CONFIG_83XX_PCICLK=0x3ef1480
+# CONFIG_PCI is not set
 CONFIG_SYS_MONITOR_LEN=786432
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
@@ -129,7 +129,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
-CONFIG_ENV_SOURCE_FILE="km83xx"
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
@@ -164,7 +163,6 @@ CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_QE_UEC=y
-# CONFIG_PCI is not set
 # CONFIG_PINCTRL_FULL is not set
 CONFIG_QE=y
 CONFIG_SYS_NS16550=y