diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-15 19:49:30 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-15 19:49:30 +0300 |
| commit | e09ca91cfa66fadb3b3e51f5bd9d15b1dfcc12d2 (patch) | |
| tree | 188c9486ec25ceeeacc4bc1497f61e7def6efdaf | |
| parent | 5a59f634e9943a8a7743ca9808f8e29308b876a8 (diff) | |
| parent | 874e544e89a7f9f42796b23f8d43c56e203b6e69 (diff) | |
| download | u-boot-e09ca91cfa66fadb3b3e51f5bd9d15b1dfcc12d2.tar.xz | |
Merge tag 'rpi-next-2022.01' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
- enable RPi Zero 2 W
- fix MMC numbering issue
- Update link to documentation
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 7 | ||||
| -rw-r--r-- | include/configs/rpi.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 55afaa54d9..ff69607d3c 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -72,7 +72,7 @@ struct msg_get_clock_rate { #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 { const char *name; @@ -157,6 +157,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2711-rpi-4-b.dtb", true, }, + [0x12] = { + "Zero 2 W", + DTB_DIR "bcm2837-rpi-zero-2.dtb", + false, + }, [0x13] = { "400", DTB_DIR "bcm2711-rpi-400.dtb", diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 55768a46da..4c5c1ac31f 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -137,7 +137,8 @@ #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 0) \ - func(MMC, mmc, 1) + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) #else #define BOOT_TARGET_MMC(func) #endif |