Merge tag 'fpga-for-v2018.11' of git://git.denx.de/u-boot-microblaze

[oweals/u-boot.git] / configs / evb-px5_defconfig

diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig
index 72e492faaa5886abc0907a5a17f8339db7961746..c3bda3bf3bb59b6b01c32cd634b58c7f66cfa9f3 100644 (file)
--- a/configs/evb-px5_defconfig
+++ b/configs/evb-px5_defconfig
@@ -1,18 +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_EVB_PX5=y
-CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb"
+CONFIG_DEBUG_UART_BASE=0xFF1c0000
+CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART=y
-CONFIG_ENV_IS_NOWHERE=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ANDROID_BOOT_IMAGE=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-px5-evb.dtb"
 # 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_IMLS is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_CACHE=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb"
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
@@ -21,8 +24,6 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3368=y
 CONFIG_RAM=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