diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
| commit | 7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch) | |
| tree | f145f655379b2298dc58ef11aa03742c159e7f56 /configs/riotboard_defconfig | |
| parent | 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (diff) | |
| parent | acbc1d86f16cc8372cccb7b862a0b9dc242f8fe5 (diff) | |
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- mx6: SOCs user selectable
Fix for imx6q_logic
Some DM conversion
- mx7: introduce secondary boot device
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/riotboard_defconfig')
| -rw-r--r-- | configs/riotboard_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index 4b4120c676..17f38a9577 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -4,9 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x60000 +CONFIG_MX6S=y CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,DDR_MB=1024" CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y |