Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-sh into next

[J-u-boot.git] / configs / integratorcp_cm1136_defconfig

diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 4cfe0bd55f33c8df5881cbfdaba5cca35b3dd9c8..f3e640bd9fdfd54f5f56b33472d56197f29f9b3c 100644 (file)
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -1,17 +1,24 @@
 CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y

-CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_TEXT_BASE=0x01000000

 CONFIG_SYS_MALLOC_LEN=0x22000
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM1136=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_MALLOC_LEN=0x22000
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM1136=y
 CONFIG_NR_DRAM_BANKS=1

+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20

 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x40000

+CONFIG_SYS_MONITOR_LEN=1048576

 CONFIG_SYS_LOAD_ADDR=0x7fc0
 CONFIG_SYS_LOAD_ADDR=0x7fc0

+CONFIG_ENV_ADDR=0x24F00000
+CONFIG_SYS_MONITOR_BASE=0x27F40000

 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="tftpboot ; bootm"
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="tftpboot ; bootm"

+CONFIG_SYS_CBSIZE=256
+CONFIG_SYS_PBSIZE=289

 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y


@@ -22,13 +29,20 @@ CONFIG_SYS_PROMPT="Integrator-CP # "
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set

-CONFIG_ENV_ADDR=0x24F00000

 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"

+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.104"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.100"

 # CONFIG_MMC is not set
 # CONFIG_MMC is not set

+CONFIG_MTD=y

 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y

+CONFIG_FLASH_SHOW_PROGRESS=0
+CONFIG_SYS_FLASH_EMPTY_INFO=y

 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y

+CONFIG_SYS_MAX_FLASH_SECT=64

 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y