aboutsummaryrefslogtreecommitdiff
path: root/configs/rock2_defconfig
diff options
context:
space:
mode:
authorSimon Glass2019-07-20 20:51:14 -0600
committerTom Rini2019-08-02 11:19:14 -0400
commit37304aaf60bf92a5dc3ef222ba520698bd862a44 (patch)
tree9d5be27f9a753780a118df63ddf2f9e081b3fe0d /configs/rock2_defconfig
parentb06da06dd41b9c72b06c9d03f434d4263bbf6bbd (diff)
Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig
This converts the following to Kconfig: CONFIG_USE_PREBOOT CONFIG_PREBOOT Both are together in one commit, since otherwise the former causes kconfig to define the latter, which gives duplicate symbol errors. Includes a manual fixup for CONFIG_PREBOOT in ids8313_defconfig since the backslash lands in the wrong place. Similarly with socfpga_vining_fpga. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'configs/rock2_defconfig')
-rw-r--r--configs/rock2_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 7639b558cf9..72c6b1f7567 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-rock2-square.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -83,6 +84,5 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y