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

[u-boot] / configs / geekbox_defconfig

diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig
index 19255fb209ff1195d2a84f8902225282c67136c0..608543cb8c66e511d447ae98285db0a771138287 100644 (file)
--- a/configs/geekbox_defconfig
+++ b/configs/geekbox_defconfig
@@ -1,20 +1,21 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_TARGET_GEEKBOX=y
+CONFIG_DEBUG_UART_BASE=0xFF690000
+CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEFAULT_DEVICE_TREE="rk3368-geekbox"
 CONFIG_DEBUG_UART=y
 # CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_CMD_IMLS is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3368=y
 CONFIG_RAM=y
-CONFIG_DEBUG_UART_BASE=0xFF690000
-CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y