configs: Resync with savedefconfig

[u-boot.git] / configs / highbank_defconfig

diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 61a25c234dd0b53a82738e756d72b39b2f33a126..b07abd97350647e04fa881797eb96c05d32bf38b 100644 (file)
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -3,31 +3,36 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_HIGHBANK=y

-CONFIG_SYS_TEXT_BASE=0x00008000
+CONFIG_TEXT_BASE=0x00008000

 CONFIG_SYS_MALLOC_LEN=0x80000
 CONFIG_SYS_MALLOC_LEN=0x80000

+CONFIG_SYS_MALLOC_F_LEN=0x400

 CONFIG_NR_DRAM_BANKS=2
 CONFIG_NR_DRAM_BANKS=2

+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000

 CONFIG_ENV_SIZE=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="highbank"
 CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c
 CONFIG_ENV_SIZE=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="highbank"
 CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c

-CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
-CONFIG_DISTRO_DEFAULTS=y

 CONFIG_SYS_LOAD_ADDR=0x800000
 CONFIG_SYS_LOAD_ADDR=0x800000

+CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
+CONFIG_ENV_ADDR=0xFFF88000

 CONFIG_FIT=y
 CONFIG_FIT=y

-CONFIG_OF_BOARD_SETUP=y
+CONFIG_DISTRO_DEFAULTS=y

 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y

+CONFIG_BOOT_RETRY=y
+CONFIG_BOOT_RETRY_TIME=-1
+CONFIG_RESET_TO_RETRY=y
+CONFIG_OF_BOARD_SETUP=y

 # CONFIG_USE_BOOTCOMMAND is not set
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_ENV_IS_IN_NVRAM=y
 # CONFIG_USE_BOOTCOMMAND is not set
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_ENV_IS_IN_NVRAM=y

-CONFIG_ENV_ADDR=0xFFF88000

 CONFIG_SCSI_AHCI=y
 CONFIG_SCSI_AHCI=y

+CONFIG_SYS_64BIT_LBA=y

 CONFIG_BOOTCOUNT_LIMIT=y
 # CONFIG_MMC is not set
 CONFIG_CALXEDA_XGMAC=y
 CONFIG_SCSI=y
 CONFIG_BOOTCOUNT_LIMIT=y
 # CONFIG_MMC is not set
 CONFIG_CALXEDA_XGMAC=y
 CONFIG_SCSI=y

-CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_SCSI_MAX_SCSI_ID=5