Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / MPC8610HPCD_defconfig

diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index 3ffed30ae208ec545477247de8a458d17bddbb6b..acdb28018b8faf2ad6861ffe54c83ba2626d16bd 100644 (file)
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PPC=y
-CONFIG_VIDEO=y
+CONFIG_SYS_TEXT_BASE=0xfff00000
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8610HPCD=y
 CONFIG_OF_BOARD_SETUP=y
@@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_HUSH_PARSER=y
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
@@ -17,10 +18,12 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_VIDEO=y
 CONFIG_OF_LIBFDT=y