Skip to contentSkip to conversation

(Take 2) PPC32: New OCP core support

PATCH In review Matt Porter 2 participants 3 messages May 12, 2004

lore
Share & tools
lore

Matt Porter

author
#0 lore raw

PATCH 1/2 (Take 2) PPC32: New OCP core support

New OCP infrastructure ported from 2.4 along with several enhancements. Updated patch includes hch and Valdis comments. Please apply.

-Matt

arch/ppc/Kconfig +1 -1
diff -Nru a/arch/ppc/Kconfig b/arch/ppc/Kconfig
@@ -1238,7 +1238,7 @@
 	bool "Support for early boot texts over serial port"
 	depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550
 
-config OCP
+config PPC_OCP
 	bool
 	depends on IBM_OCP
 	default y
arch/ppc/Makefile +0 -1
diff -Nru a/arch/ppc/Makefile b/arch/ppc/Makefile
@@ -43,7 +43,6 @@
 drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/
 drivers-$(CONFIG_4xx)		+= arch/ppc/4xx_io/
 drivers-$(CONFIG_8260)		+= arch/ppc/8260_io/
-drivers-$(CONFIG_OCP)		+= arch/ppc/ocp/
 
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
arch/ppc/kernel/setup.c +7 -0
diff -Nru a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
@@ -37,6 +37,7 @@
 #include <asm/sections.h>
 #include <asm/nvram.h>
 #include <asm/xmon.h>
+#include <asm/ocp.h>
 
 #if defined CONFIG_KGDB
 #include <asm/kgdb.h>

@@ -682,6 +683,12 @@
 	/* set up the bootmem stuff with available memory */
 	do_init_bootmem();
 	if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);
+
+#ifdef CONFIG_PPC_OCP
+	/* Initialize OCP device list */
+	ocp_early_init();
+	if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab);
+#endif
 
 	ppc_md.setup_arch();
 	if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
arch/ppc/ocp/Makefile deleted +0 -6
diff -Nru a/arch/ppc/ocp/Makefile b/arch/ppc/ocp/Makefile
@@ -1,6 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-obj-y   	:= ocp.o ocp-driver.o ocp-probe.o
-
arch/ppc/ocp/ocp-driver.c deleted +0 -195

195 lines not on this page · raw message

arch/ppc/ocp/ocp-probe.c deleted +0 -113

113 lines not on this page · raw message

arch/ppc/ocp/ocp.c deleted +0 -109

109 lines not on this page · raw message

arch/ppc/syslib/Makefile +1 -0
diff -Nru a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
@@ -13,6 +13,7 @@
 CFLAGS_btext.o          += -mrelocatable-lib
 
 obj-$(CONFIG_PPCBUG_NVRAM)	+= prep_nvram.o
+obj-$(CONFIG_PPC_OCP)		+= ocp.o
 obj-$(CONFIG_44x)		+= ibm44x_common.o
 obj-$(CONFIG_440GP)		+= ibm440gp_common.o
 ifeq ($(CONFIG_4xx),y)
arch/ppc/syslib/ocp.c new file +493 -0

493 lines not on this page · raw message

include/asm-ppc/ocp.h +119 -120

316 lines not on this page · raw message

include/asm-ppc/ocp_ids.h +17 -50

109 lines not on this page · raw message

#1 lore raw
Quoted 3 lines · Matt Porter

New OCP infrastructure ported from 2.4 along with several enhancements. Updated patch includes hch and Valdis comments. Please apply.

Thanks.. :)

author
#2 lore raw
In reply to Matt Porter
Quoted 2 lines · Matt Porter

New OCP infrastructure ported from 2.4 along with several enhancements. Updated patch includes hch and Valdis comments.

Disregard. Did a resplit into 8 parts that should show up soon. I killed off linuxppc-dev so we don't get re-posts from the broken gateway.

-Matt