diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-27 11:39:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-27 11:39:31 -0500 |
| commit | 8b195f4b716e4d802768e0e2cd63b417a4690b7f (patch) | |
| tree | ee95cc34be28ab8a49b4fb9f6d99a893006c810f /configs | |
| parent | 290e40b2aa96e13b19292d81146063e036028931 (diff) | |
| parent | 177cecdc4edcda5881cf217e21568d921b630bf5 (diff) | |
| download | u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.tar.gz u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.tar.xz u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Espressobin: Disable slot when emmc is not present (Pali)
- DS414; config header cleanup (Phil)
- PCI: auto-config enhancement (Phil)
- pci_mvebu: Also map IO region (Phil)
- serial: a3720: Implement pending method for output direction (Pali)
- turris_mox: Enable a few commands (Marek)
- helios4 & ClearFog changes (Dennis)
- Plus some minor misc changes
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/helios4_defconfig | 2 | ||||
| -rw-r--r-- | configs/turris_mox_defconfig | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig index eceb85f082..bdc6f43554 100644 --- a/configs/helios4_defconfig +++ b/configs/helios4_defconfig @@ -9,8 +9,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_HELIOS4=y CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0xFE000 CONFIG_DM_GPIO=y CONFIG_SPL_TEXT_BASE=0x40000030 CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 66dc2473d6..68867161e5 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -31,7 +31,8 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_WDT=y +CONFIG_CMD_SETEXPR=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y |