diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-06 08:30:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-06 08:30:10 -0400 |
| commit | 6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f (patch) | |
| tree | 60b9a6a5709f219f8ca3a4c9792145357863cb4a /board | |
| parent | e294ba0678359bc32085c1714329af37e33e8f16 (diff) | |
| parent | 91e1bc53c4b61cd7b871d485f4c136084245e9a2 (diff) | |
| download | u-boot-6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f.tar.gz | |
Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot
Patch queue for rpi - 2018-04-06
Highlights this time around:
- Support for new RPi3 B+ model
- Fix for some SD cards on newer RPi firmware
Diffstat (limited to 'board')
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 177f4af265..de8e308f6c 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -91,11 +91,36 @@ static const struct rpi_model rpi_model_unknown = { }; static const struct rpi_model rpi_models_new_scheme[] = { + [0x0] = { + "Model A", + DTB_DIR "bcm2835-rpi-a.dtb", + false, + }, + [0x1] = { + "Model B", + DTB_DIR "bcm2835-rpi-b.dtb", + true, + }, + [0x2] = { + "Model A+", + DTB_DIR "bcm2835-rpi-a-plus.dtb", + false, + }, + [0x3] = { + "Model B+", + DTB_DIR "bcm2835-rpi-b-plus.dtb", + true, + }, [0x4] = { "2 Model B", DTB_DIR "bcm2836-rpi-2-b.dtb", true, }, + [0x6] = { + "Compute Module", + DTB_DIR "bcm2835-rpi-cm.dtb", + false, + }, [0x8] = { "3 Model B", DTB_DIR "bcm2837-rpi-3-b.dtb", @@ -106,11 +131,21 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2835-rpi-zero.dtb", false, }, + [0xA] = { + "Compute Module 3", + DTB_DIR "bcm2837-rpi-cm3.dtb", + false, + }, [0xC] = { "Zero W", DTB_DIR "bcm2835-rpi-zero-w.dtb", false, }, + [0xD] = { + "3 Model B+", + DTB_DIR "bcm2837-rpi-3-b-plus.dtb", + true, + }, }; static const struct rpi_model rpi_models_old_scheme[] = { |