X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=configs%2Fintegratorcp_cm926ejs_defconfig;h=ef9e7442a7d508edb81b705f2890019d5e617b84;hb=e9a98ba312a325b6af1a9b75b3ce0ab0232dc614;hp=4840ec4f97a4cf990ac380f147d1145d11f52ca5;hpb=5cbbd9bd0a5d496dee2b5592bb0c4cdac16bac80;p=people%2Fms%2Fu-boot.git

diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 4840ec4f97..ef9e7442a7 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -1,4 +1,20 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S"
 CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORCP_CM926EJS=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_ARCH_INTEGRATOR_CP=y
+CONFIG_CM926EJ_S=y
+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_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_ARMFLASH=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_BAUDRATE=38400
+CONFIG_OF_LIBFDT=y