colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'rpi-next-2022.01' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi

Browse Source 
- enable RPi Zero 2 W
- fix MMC numbering issue
- Update link to documentation
This commit is contained in:
Tom Rini
2021-12-15 11:49:30 -05:00
parent 5a59f634e9 874e544e89
commit e09ca91cfa
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
board/raspberrypi/rpi/rpi.c
View File

@@ -72,7 +72,7 @@ struct msg_get_clock_rate {
#endif #endif
/* /*
* https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md * https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-revision-codes
*/ */
struct rpi_model { struct rpi_model {
const char *name; const char *name;
@@ -157,6 +157,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
DTB_DIR "bcm2711-rpi-4-b.dtb", DTB_DIR "bcm2711-rpi-4-b.dtb",
true, true,
}, },
[0x12] = {
"Zero 2 W",
DTB_DIR "bcm2837-rpi-zero-2.dtb",
false,
},
[0x13] = { [0x13] = {
"400", "400",
DTB_DIR "bcm2711-rpi-400.dtb", DTB_DIR "bcm2711-rpi-400.dtb",

3
include/configs/rpi.h
View File

@@ -137,7 +137,8 @@
#if CONFIG_IS_ENABLED(CMD_MMC) #if CONFIG_IS_ENABLED(CMD_MMC)
#define BOOT_TARGET_MMC(func) \ #define BOOT_TARGET_MMC(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(MMC, mmc, 1) func(MMC, mmc, 1) \
func(MMC, mmc, 2)
#else #else
#define BOOT_TARGET_MMC(func) #define BOOT_TARGET_MMC(func)
#endif #endif