Skip to contentSkip to conversation

rpi: fix up Model B entries

PATCH New Lubomir Rintel 2 participants 2 messages Jan 29, 2016 – Feb 8, 2016 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore

Lubomir Rintel

author
#0 lore raw

PATCH v2 1/1 rpi: fix up Model B entries

The P5 header was not present on "Model B" any board prior to Revision 2.0, there's no need for a separate device tree.

Also, it looks like "rev2" is incorrectly used to only cover the 512MiB memory models; there also were 256MiB 2.0 boards.

I don't have all of the boards to check this, I'm following this table:
http://elinux.org/RPi_HardwareHistory#Board_Revision_History

Signed-off-by Lubomir Rintel <[email protected]>

---
Changes since v1:
- The comment chaned to use less tentative language
- Add a sign-off
- Cc Tom

 board/raspberrypi/rpi/rpi.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
board/raspberrypi/rpi/rpi.c +10 -10
index 4b80d7b..b344362 100644
@@ -110,28 +110,28 @@ static const struct rpi_model rpi_models_new_scheme[] = {
 
 static const struct rpi_model rpi_models_old_scheme[] = {
 	[0x2] = {
-		"Model B (no P5)",
-		"bcm2835-rpi-b-i2c0.dtb",
+		"Model B",
+		"bcm2835-rpi-b.dtb",
 		true,
 	},
 	[0x3] = {
-		"Model B (no P5)",
-		"bcm2835-rpi-b-i2c0.dtb",
+		"Model B",
+		"bcm2835-rpi-b.dtb",
 		true,
 	},
 	[0x4] = {
-		"Model B",
-		"bcm2835-rpi-b.dtb",
+		"Model B rev2",
+		"bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x5] = {
-		"Model B",
-		"bcm2835-rpi-b.dtb",
+		"Model B rev2",
+		"bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x6] = {
-		"Model B",
-		"bcm2835-rpi-b.dtb",
+		"Model B rev2",
+		"bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x7] = {
Signature · 1 line
2.5.0
#1 lore raw

PATCH v2 1/1 rpi: fix up Model B entries

Quoted 10 lines · Lubomir Rintel

The P5 header was not present on "Model B" any board prior to Revision 2.0, there's no need for a separate device tree.

Also, it looks like "rev2" is incorrectly used to only cover the 512MiB memory models; there also were 256MiB 2.0 boards.

I don't have all of the boards to check this, I'm following this table:
http://elinux.org/RPi_HardwareHistory#Board_Revision_History

Signed-off-by Lubomir Rintel <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160208/90013c5b/attachment.sig>