bootwrapper: adds cuboot for MPC7448HPC2 platform

PATCH New Zang Roy-r61911 3 participants 6 messages May 28, 2007 – Sep 25, 2007 1 message not in the archive

Subsystems (2)

Device tree bindings PowerPC

lore

Share & tools

lore

Zang Roy-r61911

author

2007-05-28 02:30 UTC #0 lore raw

PATCH 1/1 bootwrapper: adds cuboot for MPC7448HPC2 platform

This patch adds cuboot support for MPC7448HPC2 platform. The cuImage can be used with legacy u-boot without FDT support.

Signed-off-by Roy Zang <[email protected]>

---
 arch/powerpc/boot/Makefile                 |    4 +-
 arch/powerpc/boot/cuboot-hpc2.c            |   57 ++++++++++++++++++++++++++++
 arch/powerpc/boot/dts/mpc7448hpc2.dts      |    5 ++
 arch/powerpc/boot/ppcboot.h                |    2 +-
 arch/powerpc/platforms/embedded6xx/Kconfig |    1 +
 include/asm-ppc/ppcboot.h                  |    2 +-
 6 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 arch/powerpc/boot/cuboot-hpc2.c

arch/powerpc/boot/Makefile +3 -1

index 8378898..5fa515d 100644
@@ -48,7 +48,8 @@ src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
 		gunzip_util.c elf_util.c $(zlib) devtree.c \
 		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
-		cuboot-ebony.c treeboot-ebony.c prpmc2800.c
+		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
+		cuboot-hpc2.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))

@@ -142,6 +143,7 @@ ifneq ($(CONFIG_DEVICE_TREE),"")
 image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
 image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
+image-$(CONFIG_MPC7448HPC2)		+= cuImage.hpc2
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images

arch/powerpc/boot/cuboot-hpc2.c new file +57 -0

57 lines not on this page · raw message

arch/powerpc/boot/dts/mpc7448hpc2.dts +5 -0

index 765c306..a2ee94f 100644
@@ -81,6 +81,7 @@
 		};
 
 		ethernet@6200 {
+			linux,network-index = <0>;
 			#size-cells = <0>;
 			device_type = "network";
 			model = "TSI-ETH";

@@ -93,6 +94,7 @@
 		};
 
 		ethernet@6600 {
+			linux,network-index = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";

@@ -188,5 +190,8 @@
 			};
 		};
 	};
+	chosen {
+		linux,stdout-path = "/tsi108@c0000000/serial@7808";
+	};
 
 };

arch/powerpc/boot/ppcboot.h +1 -1

index 5290ff2..f7ef004 100644
@@ -78,7 +78,7 @@ typedef struct bd_info {
 	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 #endif
 #if defined(TARGET_EVB64260) || defined(TARGET_405EP) || defined(TARGET_44x) || \
-	defined(TARGET_85xx) ||	defined(TARGET_83xx)
+	defined(TARGET_85xx) ||	defined(TARGET_83xx) || defined(TARGET_TSI108_BRIDGE)
 	/* second onboard ethernet port */
 	unsigned char	bi_enet1addr[6];
 #define HAVE_ENET1ADDR

arch/powerpc/platforms/embedded6xx/Kconfig +1 -0

index f2d2626..9a6c6c2 100644
@@ -20,6 +20,7 @@ config MPC7448HPC2
 	select TSI108_BRIDGE
 	select DEFAULT_UIMAGE
 	select PPC_UDBG_16550
+	select WANT_DEVICE_TREE
 	help
 	  Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
 	  platform

include/asm-ppc/ppcboot.h +1 -1

index 6b7b63f..eb6e18d 100644
@@ -74,7 +74,7 @@ typedef struct bd_info {
 	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 #endif
 #if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \
-	defined(CONFIG_85xx) ||	defined(CONFIG_83xx)
+	defined(CONFIG_85xx) ||	defined(CONFIG_83xx) || defined(CONFIG_TSI108_BRIDGE)
 	/* second onboard ethernet port */
 	unsigned char	bi_enet1addr[6];
 #endif

Signature · 1 line

1.5.1

Zang Roy-r61911

author

2007-07-11 08:54 UTC #1 lore raw

PATCH 1/1 bootwrapper: adds cuboot for MPC7448HPC2 platform

From: Roy Zang <[email protected]>

This patch adds cuboot support for MPC7448HPC2 platform. The cuImage can be used with legacy u-boot without FDT support.

Signed-off-by Roy Zang <[email protected]>

---
Regenerate this patch based on current Paul's tree. The original one was pasted at:
http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036834.html
Only have a small changes.
Cheers!

 arch/powerpc/boot/Makefile                 |    3 +-
 arch/powerpc/boot/cuboot-hpc2.c            |   48 ++++++++++++++++++++++++++++
 arch/powerpc/boot/dts/mpc7448hpc2.dts      |    5 +++
 arch/powerpc/boot/ppcboot.h                |    2 +-
 arch/powerpc/platforms/embedded6xx/Kconfig |    1 +
 include/asm-ppc/ppcboot.h                  |    2 +-
 6 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 arch/powerpc/boot/cuboot-hpc2.c
 delete mode 100644 include/asm-blackfin/macros.h

arch/powerpc/boot/Makefile +2 -1

index 61a6f34..3ca5a91 100644
@@ -47,7 +47,7 @@ src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
 		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
 		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
-		ps3-head.S ps3-hvcall.S ps3.c
+		ps3-head.S ps3-hvcall.S ps3.c cuboot-hpc2.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))

@@ -142,6 +142,7 @@ ifneq ($(CONFIG_DEVICE_TREE),"")
 image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
 image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
+image-$(CONFIG_MPC7448HPC2)		+= cuImage.hpc2
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images

arch/powerpc/boot/cuboot-hpc2.c new file +48 -0

48 lines not on this page · raw message

arch/powerpc/boot/dts/mpc7448hpc2.dts +5 -0

index b9158eb..f141ba2 100644
@@ -80,6 +80,7 @@
 		};
 
 		ethernet@6200 {
+			linux,network-index = <0>;
 			#size-cells = <0>;
 			device_type = "network";
 			compatible = "tsi108-ethernet";

@@ -92,6 +93,7 @@
 		};
 
 		ethernet@6600 {
+			linux,network-index = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";

@@ -187,5 +189,8 @@
 			};
 		};
 	};
+	chosen {
+		linux,stdout-path = "/tsi108@c0000000/serial@7808";
+	};
 
 };

arch/powerpc/boot/ppcboot.h +1 -1

index 5290ff2..f504e1c 100644
@@ -78,7 +78,7 @@ typedef struct bd_info {
 	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 #endif
 #if defined(TARGET_EVB64260) || defined(TARGET_405EP) || defined(TARGET_44x) || \
-	defined(TARGET_85xx) ||	defined(TARGET_83xx)
+	defined(TARGET_85xx) ||	defined(TARGET_83xx) || defined(TARGET_HAS_ENET1)
 	/* second onboard ethernet port */
 	unsigned char	bi_enet1addr[6];
 #define HAVE_ENET1ADDR

arch/powerpc/platforms/embedded6xx/Kconfig +1 -0

index bec7726..9b330a7 100644
@@ -20,6 +20,7 @@ config MPC7448HPC2
 	select TSI108_BRIDGE
 	select DEFAULT_UIMAGE
 	select PPC_UDBG_16550
+	select WANT_DEVICE_TREE
 	help
 	  Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
 	  platform

include/asm-blackfin/macros.h deleted +0 -0

deleted file mode 100644
index e69de29..0000000

include/asm-ppc/ppcboot.h +1 -1

index 6b7b63f..eb6e18d 100644
@@ -74,7 +74,7 @@ typedef struct bd_info {
 	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 #endif
 #if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \
-	defined(CONFIG_85xx) ||	defined(CONFIG_83xx)
+	defined(CONFIG_85xx) ||	defined(CONFIG_83xx) || defined(CONFIG_TSI108_BRIDGE)
 	/* second onboard ethernet port */
 	unsigned char	bi_enet1addr[6];
 #endif

Signature · 1 line

1.5.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

David Gibson

2007-07-26 06:59 UTC #3 lore raw

Quoted 17 lines · Kumar Gala

Begin forwarded message:
Quoted 13 lines
From: Zang Roy-r61911 <[email protected]>
Date: July 11, 2007 3:54:16 AM CDT
To: Paul Mackerras <[email protected]>
Cc: Kumar Gala <[email protected]>, linuxppc-dev list <[email protected]>
Subject: [PATCH] bootwrapper: adds cuboot for MPC7448HPC2 platform
From: Roy Zang <[email protected]>
This patch adds cuboot support for MPC7448HPC2 platform. The cuImage can be used with legacy u-boot without FDT support.
Signed-off-by Roy Zang <[email protected]>

[snip]

Quoted 21 lines

Quoted 21 lines
arch/powerpc/boot/cuboot-hpc2.c new file +2 -0
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights  
reserved.
+ *
+ * Author: Roy Zang <[email protected]>
+ *
+ * Description:
+ * Old U-boot compatibility for mpc7448hpc2 board
+ * Based on the code of Scott Wood <[email protected]>
+ * for 83xx and 85xx.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *

Quoted 8 lines

arch/powerpc/boot/cuboot-hpc2.c line 23
Quoted 8 lines
+ */
arch/powerpc/boot/cuboot-hpc2.c new file +7 -0
+
+#include "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#define TARGET_HAS_ENET1
+#include "ppcboot.h"

Including ppcboot.h without first defining TARGET_* defines which give the type of system seems... fragile at best, broken at worst. Surely this can only work by accident.

Signature · 4 lines

David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Scott Wood

2007-07-26 16:05 UTC #4 lore raw

Quoted 6 lines · David Gibson

Quoted 2 lines
arch/powerpc/boot/cuboot-hpc2.c line 23
Quoted 2 lines
arch/powerpc/boot/cuboot-hpc2.c new file +2 -0
+#define TARGET_HAS_ENET1
+#include "ppcboot.h"
Including ppcboot.h without first defining TARGET_* defines which give the type of system seems... fragile at best, broken at worst. Surely this can only work by accident.

What target do you suggest he define? There happen to be none in ppcboot.h that are appropriate, because there are no special fields for this target (other than eth1).

And yes, it's fragile -- the entire bd_t mechanism is fragile. In the absence of a time machine, there's not much we can do about it other than encourage people to upgrade their u-boot.

-Scott

Zang Roy-r61911

author

2007-09-24 10:30 UTC #5 lore raw

PATCH v2 1/1 bootwrapper: adds cuboot for MPC7448HPC2 platform

In reply to Zang Roy-r61911

From: Roy Zang <[email protected]>

This patch adds cuboot support for MPC7448HPC2 platform. The cuImage can be used with legacy u-boot without FDT support.

Signed-off-by Roy Zang <[email protected]>

---
This is the third time for me to generate the patch. I do not get any negative comment since my previous commit . Hope your guys can pick it up and merge it into 2.6.24. The original were pasted at:
http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036834.html
http://ozlabs.org/pipermail/linuxppc-dev/2007-July/038952.html

Cheers

 arch/powerpc/boot/Makefile                 |    3 +-
 arch/powerpc/boot/cuboot-hpc2.c            |   48 ++++++++++++++++++++++++++++
 arch/powerpc/boot/dts/mpc7448hpc2.dts      |    5 +++
 arch/powerpc/platforms/embedded6xx/Kconfig |    1 +
 4 files changed, 56 insertions(+), 1 deletions(-)
 create mode 100644 arch/powerpc/boot/cuboot-hpc2.c

arch/powerpc/boot/Makefile +2 -1

index cffef14..6ed1415 100644
@@ -49,7 +49,7 @@ src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
 		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
 		ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
-		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c
+		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-hpc2.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))

@@ -146,6 +146,7 @@ image-$(CONFIG_8260)			+= cuImage.pq2
 image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
 image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
+image-$(CONFIG_MPC7448HPC2)		+= cuImage.hpc2
 image-$(CONFIG_BAMBOO)			+= treeImage.bamboo
 image-$(CONFIG_SEQUOIA)			+= cuImage.sequoia
 image-$(CONFIG_WALNUT)			+= treeImage.walnut

arch/powerpc/boot/cuboot-hpc2.c new file +48 -0

48 lines not on this page · raw message

arch/powerpc/boot/dts/mpc7448hpc2.dts +5 -0

index 70e8a2e..0b58136 100644
@@ -79,6 +79,7 @@
 		};
 
 		ethernet@6200 {
+			linux,network-index = <0>;
 			#size-cells = <0>;
 			device_type = "network";
 			compatible = "tsi109-ethernet", "tsi108-ethernet";

@@ -91,6 +92,7 @@
 		};
 
 		ethernet@6600 {
+			linux,network-index = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";

@@ -184,5 +186,8 @@
 			};
 		};
 	};
+	chosen {
+		linux,stdout-path = "/tsi108@c0000000/serial@7808";
+	};
 
 };

arch/powerpc/platforms/embedded6xx/Kconfig +1 -0

index 2d12f77..6d10e84 100644
@@ -20,6 +20,7 @@ config MPC7448HPC2
 	select TSI108_BRIDGE
 	select DEFAULT_UIMAGE
 	select PPC_UDBG_16550
+	select WANT_DEVICE_TREE
 	help
 	  Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
 	  platform

Signature · 1 line

1.5.2

David Gibson

Acked-by on v2 1/1

2007-09-25 01:57 UTC #6 lore raw

Quoted 6 lines · On Mon, Sep 24, 2007 at 06:31:55PM +0800, Zang Roy-r61911 wrote:

From: Roy Zang <[email protected]>
This patch adds cuboot support for MPC7448HPC2 platform. The cuImage can be used with legacy u-boot without FDT support.
Signed-off-by Roy Zang <[email protected]>

Acked-by David Gibson <[email protected]>

Signature · 4 lines

David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson