Add initial iomega StorCenter board port.
PATCH v3 2/3 Add initial iomega StorCenter board port.
Use cuImage bootwrapper until U-Boot port is completed. Derived heavily from Linkstation port.
--- arch/powerpc/boot/Makefile | 3 +- arch/powerpc/boot/cuboot-824x.c | 53 +++++++ arch/powerpc/platforms/embedded6xx/Kconfig | 23 ++- arch/powerpc/platforms/embedded6xx/Makefile | 1 + arch/powerpc/platforms/embedded6xx/storcenter.c | 188 +++++++++++++++++++++++ 5 files changed, 261 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/boot/cuboot-824x.c create mode 100644 arch/powerpc/platforms/embedded6xx/storcenter.c
arch/powerpc/boot/Makefile +2 -1
@@ -57,7 +57,7 @@ src-wlib := string.S crt0.S stdio.c main.c \ 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ fsl-soc.c mpc8xx.c pq2.c -src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \ +src-plat := of.c cuboot-52xx.c cuboot-824x.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-bamboo.c \
@@ -196,6 +196,7 @@ image-$(CONFIG_PPC_EP88XC) += zImage.ep88xc image-$(CONFIG_EP405) += zImage.ep405 image-$(CONFIG_8260) += cuImage.pq2 image-$(CONFIG_PPC_MPC52xx) += cuImage.52xx +image-$(CONFIG_STORCENTER) += cuImage.824x image-$(CONFIG_PPC_83xx) += cuImage.83xx image-$(CONFIG_PPC_85xx) += cuImage.85xx image-$(CONFIG_MPC7448HPC2) += cuImage.hpc2
arch/powerpc/boot/cuboot-824x.c new file +53 -0
53 lines not on this page · raw message
arch/powerpc/platforms/embedded6xx/Kconfig +17 -6
@@ -9,6 +9,8 @@ config LINKSTATION select FSL_SOC select PPC_UDBG_16550 if SERIAL_8250 select DEFAULT_UIMAGE + select MPC10X_OPENPIC + select MPC10X_BRIDGE help Select LINKSTATION if configuring for one of PPC- (MPC8241) based NAS systems from Buffalo Technology. So far only
@@ -16,6 +18,19 @@ config LINKSTATION Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based Terastation systems should be supported too. +config STORCENTER + bool "IOMEGA StorCenter" + depends on EMBEDDED6xx + select MPIC + select FSL_SOC + select PPC_UDBG_16550 if SERIAL_8250 + select WANT_DEVICE_TREE + select MPC10X_OPENPIC + select MPC10X_BRIDGE + help + Select STORCENTER if configuring for the iomega StorCenter + with an 8241 CPU in it. + config MPC7448HPC2 bool "Freescale MPC7448HPC2(Taiga)" depends on EMBEDDED6xx
@@ -23,6 +38,7 @@ config MPC7448HPC2 select DEFAULT_UIMAGE select PPC_UDBG_16550 select WANT_DEVICE_TREE + select TSI108_BRIDGE help Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) platform
@@ -33,6 +49,7 @@ config PPC_HOLLY select TSI108_BRIDGE select PPC_UDBG_16550 select WANT_DEVICE_TREE + select TSI108_BRIDGE help Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval Board with TSI108/9 bridge (Hickory/Holly)
@@ -48,17 +65,13 @@ config PPC_PRPMC2800 config TSI108_BRIDGE bool - depends on MPC7448HPC2 || PPC_HOLLY select PCI select MPIC select MPIC_WEIRD - default y config MPC10X_BRIDGE bool - depends on LINKSTATION select PPC_INDIRECT_PCI - default y config MV64X60 bool
@@ -67,8 +80,6 @@ config MV64X60 config MPC10X_OPENPIC bool - depends on LINKSTATION - default y config MPC10X_STORE_GATHERING bool "Enable MPC10x store gathering"
arch/powerpc/platforms/embedded6xx/Makefile +1 -0
@@ -3,5 +3,6 @@ # obj-$(CONFIG_MPC7448HPC2) += mpc7448_hpc2.o obj-$(CONFIG_LINKSTATION) += linkstation.o ls_uart.o +obj-$(CONFIG_STORCENTER) += storcenter.o obj-$(CONFIG_PPC_HOLLY) += holly.o obj-$(CONFIG_PPC_PRPMC2800) += prpmc2800.o
arch/powerpc/platforms/embedded6xx/storcenter.c new file +188 -0
188 lines not on this page · raw message
Signature · 1 line
1.5.4.rc0
Hi Jon,
Quoted 4 lines · On Tue, 22 Jan 2008 16:37:59 -0600 Jon Loeliger <[email protected]> wrote:
+++
b/arch/powerpc/platforms/embedded6xx/storcenter.c+extern void
_nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
This clearly needs to be decalred in some header file. (I know you did not introduce it.) In arch/ppc, it was declared in asm/system.h (but I don't know if that is appropriate for arch/powerpc). Maybe you could do a preceeding patch that does this and fixes the other user.
Quoted 4 lines
arch/powerpc/platforms/embedded6xx/storcenter.c new file +4
-0+static void __init storcenter_init_IRQ (void ) +{ +struct mpic *mpic; +struct device_node *dnp;
arch/powerpc/platforms/embedded6xx/storcenter.c line 129
Quoted 10 lines
arch/powerpc/platforms/embedded6xx/storcenter.c new file +10
-0+const void *prop; +int size; +phys_addr_t paddr; + + dnp =of_find_node_by_type (NULL ,"open-pic" ); +if (dnp ==NULL ) +return ; + + prop =of_get_property (dnp,"reg" , &size); + paddr = (phys_addr_t )of_translate_address (dnp, prop);
What happens of "prop" is NULL?
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 11 lines · Stephen Rothwell
Hi Jon,
Quoted 3 lines · On Tue, 22 Jan 2008 16:37:59 -0600 Jon Loeliger <[email protected]> wrote:
+++
b/arch/powerpc/platforms/embedded6xx/storcenter.c+extern void
_nmask_and_or_msr(unsigned long nmask, unsigned long or_val);This clearly needs to be decalred in some header file. (I know you did not introduce it.) In
arch/ppc, it was declared inasm/system.h(but I don't know if that is appropriate forarch/powerpc). Maybe you could do a preceeding patch that does this and fixes the other user.
I hear my Janitorial Karmic Duty calling.
Quoted 6 lines
arch/powerpc/platforms/embedded6xx/storcenter.c line 129
Quoted 4 lines
arch/powerpc/platforms/embedded6xx/storcenter.c new file +3
-0+static void __init storcenter_init_IRQ (void ) + prop =of_get_property (dnp,"reg" , &size); + paddr = (phys_addr_t )of_translate_address (dnp, prop);What happens of "prop" is NULL?
Someone should fix that case too. :-)
Kumar,
I'll respin this trio for you.
jdl