diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-14 08:43:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-14 08:43:33 -0400 |
| commit | fe16786149c8f1b2db95ed614a760bc443da6472 (patch) | |
| tree | f752f84e6e532497b167cb51b65e132993618c9b /configs | |
| parent | cae802924e423900df24dc58f382896ceb42a54b (diff) | |
| parent | 82aef6c6f8a74a0595501bfbb2f6f763c786324f (diff) | |
| download | u-boot-fe16786149c8f1b2db95ed614a760bc443da6472.tar.gz | |
Merge tag 'rpi-next-2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi
- fix phy configuration for RPi4's bcmgenet
- sync RPi4's env size with other RPi configs
- add kconfig option to reserver more pages in the EFI mem map
- add support for SDMA which is used by RPi4
- fix corner case boot bug for RPi3 32-bit
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/rpi_4_32b_defconfig | 1 | ||||
| -rw-r--r-- | configs/rpi_4_defconfig | 1 | ||||
| -rw-r--r-- | configs/rpi_arm64_defconfig | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 8d262d89b4..52bdd0ab02 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -24,6 +24,7 @@ CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_DM_ETH=y CONFIG_BCMGENET=y diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 2a0cea4222..2ce1b6b6ec 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -24,6 +24,7 @@ CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_DM_ETH=y CONFIG_BCMGENET=y diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index d2406ca36d..66c4a5368c 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_ARM64=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ENV_SIZE=0x4000 CONFIG_NR_DRAM_BANKS=2 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y @@ -22,6 +23,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_DM_ETH=y CONFIG_BCMGENET=y |