[U-Boot] [PATCH v2] rpi: fix up Model B entries

[U-Boot] [PATCH v2] rpi: fix up Model B entries

[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 <lkundrak@v3.sk>
---
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(-)

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 4b80d7b..b344362 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -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] = {
-- 
2.5.0

[U-Boot] [U-Boot,v2] rpi: fix up Model B entries

[Tom Rini]

On Fri, Jan 29, 2016 at 09:35:52AM +0100, Lubomir Rintel wrote:

> 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 <lkundrak@v3.sk>

Applied to u-boot/master, thanks!

-- 
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>