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

[u-boot] / configs / evb-px5_defconfig

diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig
index 8926f8971c37df6145d87487bf6c4e8439eb5253..c3b1c0584217ce14144e8a6bb7271996aff3da4f 100644 (file)
--- a/configs/evb-px5_defconfig
+++ b/configs/evb-px5_defconfig
@@ -1,15 +1,17 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_TARGET_EVB_PX5=y
+CONFIG_DEBUG_UART_BASE=0xFF1c0000
+CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb"
-CONFIG_HUSH_PARSER=y
+CONFIG_DEBUG_UART=y
+CONFIG_ANDROID_BOOT_IMAGE=y
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ARCH_EARLY_INIT_R=y
-CONFIG_FASTBOOT=y
-CONFIG_ANDROID_BOOT_IMAGE=y
-CONFIG_CMD_BOOTRK=y
-# CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_CACHE=y
 CONFIG_REGMAP=y
@@ -20,9 +22,6 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3368=y
 CONFIG_RAM=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_BASE=0xFF1c0000
-CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y