diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-14 08:47:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-14 08:47:07 -0400 |
| commit | 142a07f2a44262d76fec609e1fcde51794a456eb (patch) | |
| tree | fc2304595e16ff9315c84e76e9a12b6fbb8a01e7 /configs | |
| parent | 2af31afc7ac55b2d11676da51599c6dd679e77c3 (diff) | |
| parent | c64ac3b3185aeb3846297ad7391fc6df8ecd73bf (diff) | |
| download | u-boot-142a07f2a44262d76fec609e1fcde51794a456eb.zip u-boot-142a07f2a44262d76fec609e1fcde51794a456eb.tar.gz u-boot-142a07f2a44262d76fec609e1fcde51794a456eb.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
- Misc enhancements to Clearfog, including board variant detection
(Joel)
- Misc enhancements to Turris Mox, including generalization of the
ARMADA37xx DDR size detection (Marek)
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/clearfog_defconfig | 2 | ||||
| -rw-r--r-- | configs/turris_mox_defconfig | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index c938448..6db8b8a 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -9,8 +9,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CLEARFOG=y CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0xF0000 CONFIG_DM_GPIO=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 2e63704..d786255 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_OFFSET=0x180000 CONFIG_DM_GPIO=y -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=2 CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=25804800 CONFIG_DEBUG_UART=y @@ -37,6 +37,7 @@ CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_OF_BOARD_FIXUP=y +CONFIG_OF_BOARD_SETUP=y CONFIG_DEFAULT_DEVICE_TREE="armada-3720-turris-mox" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y |