diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-26 13:50:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-26 13:50:00 -0400 |
| commit | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (patch) | |
| tree | f9b57804a3f3c57efcb5a17c836396b3b04dbf5f /configs/turris_omnia_defconfig | |
| parent | 1c64692df20c1f491ea79de3a732428611bb0ba0 (diff) | |
| parent | b684d4031b38b6b6a9e22676c7c6e2770e767cc7 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Add DM based generic watchdog start and reset implementation
and remove all ad-hoc implementations (Stefan)
- Move mv_sdhci to DM (Pierre)
- Misc turris_omnia updates (Pierre)
- Change openrd targets to correctly build again (size changes
and fixes to the dts targets) and bring it back into Travis
builds (Stefan)
- Add Kirkwood db-88f6281-bp board (Chris)
Diffstat (limited to 'configs/turris_omnia_defconfig')
| -rw-r--r-- | configs/turris_omnia_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index 85f214148a..a528a9b5bc 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SPL_SYS_THUMB_BUILD=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -7,13 +8,13 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_TURRIS_OMNIA=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y +CONFIG_NR_DRAM_BANKS=2 CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=2 CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y @@ -40,6 +41,7 @@ CONFIG_ENV_SPI_MAX_HZ=50000000 CONFIG_SPL_OF_TRANSLATE=y CONFIG_SCSI_AHCI=y CONFIG_ATSHA204A=y +CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y |