Merge git://www.denx.de/git/u-boot-imx

[u-boot] / configs / ap121_defconfig

diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig
index bd3d0da21924e8e2d1e9a4e369d9619d8f21a2cb..d76cb65da9efe1d96bf7b8633b4f12f6dcbe1b71 100644 (file)
--- a/configs/ap121_defconfig
+++ b/configs/ap121_defconfig
@@ -3,7 +3,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ARCH_ATH79=y
 CONFIG_DEFAULT_DEVICE_TREE="ap121"
 CONFIG_DEBUG_UART=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="ap121 # "
@@ -17,9 +20,9 @@ CONFIG_SYS_PROMPT="ap121 # "
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
-# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_MTDPARTS=y