Merge https://gitlab.denx.de/u-boot/custodians/u-boot-stm

[platform/kernel/u-boot.git] / configs / bubblegum_96_defconfig

diff --git a/configs/bubblegum_96_defconfig b/configs/bubblegum_96_defconfig
index a2bd7e8..1cfcbb6 100644 (file)
--- a/configs/bubblegum_96_defconfig
+++ b/configs/bubblegum_96_defconfig
@@ -1,22 +1,17 @@
 CONFIG_ARM=y
 CONFIG_ARCH_OWL=y
-CONFIG_TARGET_BUBBLEGUM_96=y
-CONFIG_SYS_TEXT_BASE=0x11000000
+CONFIG_ENV_SIZE=0x2000
+CONFIG_MACH_S900=y
 CONFIG_IDENT_STRING="\nBubblegum-96"
 CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96"
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BOOTDELAY=5
 CONFIG_USE_BOOTARGS=y
-CONFIG_ARM_SMCCC=y
 CONFIG_BOOTARGS="console=ttyOWL5,115200n8"
-CONFIG_BOOTDELAY=5
-CONFIG_SYS_PROMPT="U-Boot => "
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_SYS_PROMPT="U-Boot => "
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
-CONFIG_CLK=y
-CONFIG_CLK_OWL=y
-CONFIG_CLK_S900=y
-CONFIG_OWL_SERIAL=y