Skip to contentSkip to conversation

Base support for 440SPe "Katmai" eval board

PATCH In review Benjamin Herrenschmidt 3 participants 4 messages Dec 21, 2007 – Dec 23, 2007

Subsystems (3)
Device tree bindings PowerPC Linux for PowerPC embedded PPC4XX
lore
Share & tools
lore

Benjamin Herrenschmidt

author
#0 lore raw

PATCH 17/21 Base support for 440SPe "Katmai" eval board

This adds base support for the Katmai board, including PCI-X and PCI-Express (but no RTC, nvram, etc... yet).

Signed-off-by Benjamin Herrenschmidt <[email protected]>
Acked-by Stefan Roese <[email protected]>

---

As for Taishan, the bootwrapper code can be simplified. In fact, we probably don't need to probe clocks & memsize off the chip and just trust what uboot tells us.

 arch/powerpc/boot/Makefile            |    5 
 arch/powerpc/boot/cuboot-katmai.c     |   56 ++
 arch/powerpc/boot/dts/katmai.dts      |  392 ++++++++++++++++
 arch/powerpc/configs/katmai_defconfig |  789 ++++++++++++++++++++++++++++++++++
 arch/powerpc/platforms/44x/Kconfig    |   14 
 arch/powerpc/platforms/44x/Makefile   |    3 
 arch/powerpc/platforms/44x/katmai.c   |   63 ++
 7 files changed, 1320 insertions(+), 2 deletions(-)
arch/powerpc/platforms/44x/Kconfig +14 -0
@@ -34,6 +34,16 @@ config TAISHAN
 	  This option enables support for the AMCC PPC440GX "Taishan"
 	  evaluation board.
 
+config KATMAI
+	bool "Katmai"
+	depends on 44x
+	default n
+	select 440SPe
+	select PCI
+	select PPC4xx_PCI_EXPRESS
+	help
+	  This option enables support for the AMCC PPC440SPe evaluation board.
+
 #config LUAN
 #	bool "Luan"
 #	depends on 44x

@@ -78,6 +88,10 @@ config 440GX
 config 440SP
 	bool
 
+config 440SPe
+        select IBM_NEW_EMAC_EMAC4
+	bool
+
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
 	bool
arch/powerpc/platforms/44x/Makefile +2 -1
Index: linux-merge/arch/powerpc/platforms/44x/Makefile
===================================================================
@@ -1,5 +1,6 @@
 obj-$(CONFIG_44x)	:= misc_44x.o
 obj-$(CONFIG_EBONY)	+= ebony.o
 obj-$(CONFIG_TAISHAN)	+= taishan.o
-obj-$(CONFIG_BAMBOO) += bamboo.o
+obj-$(CONFIG_BAMBOO)	+= bamboo.o
 obj-$(CONFIG_SEQUOIA)	+= sequoia.o
+obj-$(CONFIG_KATMAI)	+= katmai.o
arch/powerpc/boot/dts/katmai.dts new file +392 -0

392 lines not on this page · raw message

arch/powerpc/platforms/44x/katmai.c new file +63 -0

63 lines not on this page · raw message

arch/powerpc/boot/cuboot-katmai.c new file +56 -0

56 lines not on this page · raw message

arch/powerpc/boot/Makefile +4 -1
Index: linux-merge/arch/powerpc/boot/Makefile
===================================================================
@@ -38,6 +38,7 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
 $(obj)/4xx.o: BOOTCFLAGS += -mcpu=440
 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
 $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
 
 

@@ -60,7 +61,8 @@ src-plat := of.c cuboot-52xx.c cuboot-83
 		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 \
-		fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c
+		fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \
+		cuboot-katmai.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))

@@ -202,6 +204,7 @@ image-$(CONFIG_BAMBOO)			+= treeImage.ba
 image-$(CONFIG_SEQUOIA)			+= cuImage.sequoia
 image-$(CONFIG_WALNUT)			+= treeImage.walnut
 image-$(CONFIG_TAISHAN)			+= cuImage.taishan
+image-$(CONFIG_KATMAI)			+= cuImage.katmai
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
arch/powerpc/configs/katmai_defconfig new file +789 -0

789 lines not on this page · raw message

#1 lore raw

arch/powerpc/platforms/44x/katmai.c line 27

Quoted 4 lines · On Fri, 21 Dec 2007 15:39:34 +1100 Benjamin Herrenschmidt…

+++ linux-merge/arch/powerpc/platforms/44x/katmai.c 2007-12-21 14:34:33.000000000 +1100

arch/powerpc/platforms/44x/katmai.c new file +2 -0
+
+static struct of_device_id katmai_of_bus[] = {

__initdata (preferably) or const, please.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
Quoted 7 lines · On Sat, 22 Dec 2007 11:21:05 +1100 Stephen Rothwell <[email protected]>…

arch/powerpc/platforms/44x/katmai.c line 27

Quoted 4 lines · On Fri, 21 Dec 2007 15:39:34 +1100 Benjamin Herrenschmidt…

+++ linux-merge/arch/powerpc/platforms/44x/katmai.c 2007-12-21 14:34:33.000000000 +1100

arch/powerpc/platforms/44x/katmai.c new file +2 -0
+
+static struct of_device_id katmai_of_bus[] = {

__initdata (preferably) or const, please.

I'll fix this with a separate commit. The same comment applies for all the 4xx platforms already in the kernel.

josh

#3 lore raw
Quoted 6 lines · On Fri, 21 Dec 2007 19:48:28 -0600 Josh Boyer <[email protected]> wrote:
Quoted 2 lines · On Sat, 22 Dec 2007 11:21:05 +1100 Stephen Rothwell <[email protected]>…
Quoted 1 line · On Fri, 21 Dec 2007 15:39:34 +1100 Benjamin Herrenschmidt…
Quoted 8 lines
Quoted 5 lines

arch/powerpc/platforms/44x/katmai.c line 27

Quoted 3 lines

+++ linux-merge/arch/powerpc/platforms/44x/katmai.c 2007-12-21 14:34:33.000000000 +1100

arch/powerpc/platforms/44x/katmai.c new file +2 -0
+
+static struct of_device_id katmai_of_bus[] = {

__initdata (preferably) or const, please.

I'll fix this with a separate commit. The same comment applies for all the 4xx platforms already in the kernel.

Fine by me.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/