aboutsummaryrefslogtreecommitdiff
path: root/configs/riotboard_defconfig
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2021-04-02 15:52:28 +0100
committerStefano Babic <sbabic@denx.de>2021-04-08 20:29:54 +0200
commitf3bd944817210f4a2792a8ab8366a8423503851e (patch)
tree2707bc8af47ff94b329cbf86f421a18f364bfb4c /configs/riotboard_defconfig
parentb5c6019dfc696ac7597e1de9b5b07bdf409eb51c (diff)
downloadu-boot-f3bd944817210f4a2792a8ab8366a8423503851e.zip
u-boot-f3bd944817210f4a2792a8ab8366a8423503851e.tar.gz
u-boot-f3bd944817210f4a2792a8ab8366a8423503851e.tar.bz2
ARM: embestmx6boards: merge the riotboard's configs together
It doesn't make much sense to have two separate configs for the riotboard so let's merge the SPL config into the main one for less duplication. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Cc: "Eric BĂ©nard" <eric@eukrea.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'configs/riotboard_defconfig')
-rw-r--r--configs/riotboard_defconfig14
1 files changed, 13 insertions, 1 deletions
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index b652057..074c0d5 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -1,18 +1,29 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x60000
CONFIG_MX6S=y
CONFIG_TARGET_EMBESTMX6BOARDS=y
+CONFIG_SPL_TEXT_BASE=0x00908000
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,SPL,DDR_MB=1024"
CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_SPL_RAW_IMAGE_SUPPORT=y
+CONFIG_SPL_FS_EXT4=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
@@ -57,3 +68,4 @@ CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_RLE8=y
CONFIG_BMP_16BPP=y
CONFIG_OF_LIBFDT=y
+CONFIG_SPL_OF_LIBFDT=y