GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rpi: Fix device tree path on ARM64

Browse source 
The directory structure of device tree files produced by the kernel's
'make dtbs_install' is different on ARM64, the RPi3 device tree file is
in a 'broadcom' subdirectory there.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
This commit is contained in:
Tuomas Tynkkynen 2017-01-23 01:34:39 +02:00 • committed by Tom Rini
parent 919b485834
commit 5d3c4ba19f
1 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
board/raspberrypi/rpi/rpi.c
View file

@ -65,6 +65,12 @@ struct msg_get_clock_rate {
u32 end_tag; u32 end_tag;
}; };
#ifdef CONFIG_ARM64
#define DTB_DIR "broadcom/"
#else
#define DTB_DIR ""
#endif
/* /*
* http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/ * http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/
* http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=32733 * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=32733
@ -83,24 +89,24 @@ struct rpi_model {
static const struct rpi_model rpi_model_unknown = { static const struct rpi_model rpi_model_unknown = {
"Unknown model", "Unknown model",
"bcm283x-rpi-other.dtb", DTB_DIR "bcm283x-rpi-other.dtb",
false, false,
}; };
static const struct rpi_model rpi_models_new_scheme[] = { static const struct rpi_model rpi_models_new_scheme[] = {
[0x4] = { [0x4] = {
"2 Model B", "2 Model B",
"bcm2836-rpi-2-b.dtb", DTB_DIR "bcm2836-rpi-2-b.dtb",
true, true,
}, },
[0x8] = { [0x8] = {
"3 Model B", "3 Model B",
"bcm2837-rpi-3-b.dtb", DTB_DIR "bcm2837-rpi-3-b.dtb",
true, true,
}, },
[0x9] = { [0x9] = {
"Zero", "Zero",
"bcm2835-rpi-zero.dtb", DTB_DIR "bcm2835-rpi-zero.dtb",
false, false,
}, },
}; };
@ -108,87 +114,87 @@ static const struct rpi_model rpi_models_new_scheme[] = {
static const struct rpi_model rpi_models_old_scheme[] = { static const struct rpi_model rpi_models_old_scheme[] = {
[0x2] = { [0x2] = {
"Model B", "Model B",
"bcm2835-rpi-b.dtb", DTB_DIR "bcm2835-rpi-b.dtb",
true, true,
}, },
[0x3] = { [0x3] = {
"Model B", "Model B",
"bcm2835-rpi-b.dtb", DTB_DIR "bcm2835-rpi-b.dtb",
true, true,
}, },
[0x4] = { [0x4] = {
"Model B rev2", "Model B rev2",
"bcm2835-rpi-b-rev2.dtb", DTB_DIR "bcm2835-rpi-b-rev2.dtb",
true, true,
}, },
[0x5] = { [0x5] = {
"Model B rev2", "Model B rev2",
"bcm2835-rpi-b-rev2.dtb", DTB_DIR "bcm2835-rpi-b-rev2.dtb",
true, true,
}, },
[0x6] = { [0x6] = {
"Model B rev2", "Model B rev2",
"bcm2835-rpi-b-rev2.dtb", DTB_DIR "bcm2835-rpi-b-rev2.dtb",
true, true,
}, },
[0x7] = { [0x7] = {
"Model A", "Model A",
"bcm2835-rpi-a.dtb", DTB_DIR "bcm2835-rpi-a.dtb",
false, false,
}, },
[0x8] = { [0x8] = {
"Model A", "Model A",
"bcm2835-rpi-a.dtb", DTB_DIR "bcm2835-rpi-a.dtb",
false, false,
}, },
[0x9] = { [0x9] = {
"Model A", "Model A",
"bcm2835-rpi-a.dtb", DTB_DIR "bcm2835-rpi-a.dtb",
false, false,
}, },
[0xd] = { [0xd] = {
"Model B rev2", "Model B rev2",
"bcm2835-rpi-b-rev2.dtb", DTB_DIR "bcm2835-rpi-b-rev2.dtb",
true, true,
}, },
[0xe] = { [0xe] = {
"Model B rev2", "Model B rev2",
"bcm2835-rpi-b-rev2.dtb", DTB_DIR "bcm2835-rpi-b-rev2.dtb",
true, true,
}, },
[0xf] = { [0xf] = {
"Model B rev2", "Model B rev2",
"bcm2835-rpi-b-rev2.dtb", DTB_DIR "bcm2835-rpi-b-rev2.dtb",
true, true,
}, },
[0x10] = { [0x10] = {
"Model B+", "Model B+",
"bcm2835-rpi-b-plus.dtb", DTB_DIR "bcm2835-rpi-b-plus.dtb",
true, true,
}, },
[0x11] = { [0x11] = {
"Compute Module", "Compute Module",
"bcm2835-rpi-cm.dtb", DTB_DIR "bcm2835-rpi-cm.dtb",
false, false,
}, },
[0x12] = { [0x12] = {
"Model A+", "Model A+",
"bcm2835-rpi-a-plus.dtb", DTB_DIR "bcm2835-rpi-a-plus.dtb",
false, false,
}, },
[0x13] = { [0x13] = {
"Model B+", "Model B+",
"bcm2835-rpi-b-plus.dtb", DTB_DIR "bcm2835-rpi-b-plus.dtb",
true, true,
}, },
[0x14] = { [0x14] = {
"Compute Module", "Compute Module",
"bcm2835-rpi-cm.dtb", DTB_DIR "bcm2835-rpi-cm.dtb",
false, false,
}, },
[0x15] = { [0x15] = {
"Model A+", "Model A+",
"bcm2835-rpi-a-plus.dtb", DTB_DIR "bcm2835-rpi-a-plus.dtb",
false, false,
}, },
}; };