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 /board | |
| 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 'board')
| -rw-r--r-- | board/raspberrypi/rpi/Kconfig | 10 | ||||
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/board/raspberrypi/rpi/Kconfig b/board/raspberrypi/rpi/Kconfig new file mode 100644 index 0000000000..e40088fde1 --- /dev/null +++ b/board/raspberrypi/rpi/Kconfig @@ -0,0 +1,10 @@ +if SYS_BOARD = "rpi" + +config RPI_EFI_NR_SPIN_PAGES + int "Spin table page count" + default 1 + help + Number of pages to reserve starting at page 0 for spin tables in the EFI + memory map + +endif diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index e367ba3092..0206a093d4 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -489,7 +489,8 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_EFI_LOADER /* Reserve the spin table */ - efi_add_memory_map(0, 1, EFI_RESERVED_MEMORY_TYPE, 0); + efi_add_memory_map(0, CONFIG_RPI_EFI_NR_SPIN_PAGES, + EFI_RESERVED_MEMORY_TYPE, 0); #endif return 0; |