[PATCH 0/3 v2] Remove need for include/asm-ppc

STALE6928d

Revision v2 of 3 in this series.

19 messages, 9 authors, 2007-08-21 · open the first message on its own page

[PATCH 0/3 v2] Remove need for include/asm-ppc

From: Kumar Gala <hidden>
Date: 2007-08-18 17:05:23 

This patch series removes the need for include/asm-ppc in the ARCH=powerpc
build for ppc32.  They exist in the following git tree:

  master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24

posting here for everyone else to see.

Updated with changes suggested by Arnd & Segher. (removal 82xx pci header
and moving some headers under platforms if not globally needed).

- k

[PATCH 1/3 v2][POWERPC] Remove old includes from arch/ppc

From: Kumar Gala <hidden>
Date: 2007-08-18 17:06:57 

Remove includes of files that existed in arch/ppc that we dont need in
arch/powerpc anymore.  The following includes were removed:

 <asm/amigappc.h>
 <asm/bootinfo.h>
 <asm/ppcboot.h>
 <asm/ppc_sys.h>
 <asm/residual.h>
 <asm/m8260_pci.h>

Signed-off-by: Kumar Gala <redacted>
---

Added m8260_pci.h to the cleanup.

 arch/powerpc/kernel/setup_32.c               |    2 --
 arch/powerpc/platforms/52xx/lite5200.c       |    1 -
 arch/powerpc/platforms/82xx/m82xx_pci.h      |    2 --
 arch/powerpc/platforms/82xx/mpc82xx.c        |    1 -
 arch/powerpc/platforms/82xx/mpc82xx_ads.c    |    1 -
 arch/powerpc/platforms/82xx/pq2ads.h         |    1 -
 arch/powerpc/platforms/83xx/mpc832x_mds.c    |    1 -
 arch/powerpc/platforms/83xx/mpc834x_itx.c    |    1 -
 arch/powerpc/platforms/83xx/mpc834x_mds.c    |    1 -
 arch/powerpc/platforms/83xx/mpc836x_mds.c    |    1 -
 arch/powerpc/platforms/85xx/mpc85xx_cds.c    |    1 -
 arch/powerpc/platforms/85xx/mpc85xx_mds.c    |    1 -
 arch/powerpc/platforms/8xx/m8xx_setup.c      |    4 ++--
 arch/powerpc/platforms/8xx/mpc86xads.h       |    1 -
 arch/powerpc/platforms/8xx/mpc86xads_setup.c |    1 -
 arch/powerpc/platforms/8xx/mpc885ads.h       |    1 -
 arch/powerpc/platforms/8xx/mpc885ads_setup.c |    1 -
 arch/powerpc/platforms/chrp/smp.c            |    1 -
 arch/powerpc/platforms/embedded6xx/ls_uart.c |    1 -
 arch/powerpc/platforms/powermac/bootx_init.c |    1 -
 20 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 7ec6ba5..a288a5f 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -18,13 +18,11 @@
 #include <linux/cpu.h>
 #include <linux/console.h>

-#include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
-#include <asm/amigappc.h>
 #include <asm/smp.h>
 #include <asm/elf.h>
 #include <asm/cputable.h>
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 84bd3da..ce3f695 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -35,7 +35,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/82xx/m82xx_pci.h b/arch/powerpc/platforms/82xx/m82xx_pci.h
index 9cd8893..65e38a7 100644
--- a/arch/powerpc/platforms/82xx/m82xx_pci.h
+++ b/arch/powerpc/platforms/82xx/m82xx_pci.h
@@ -8,8 +8,6 @@
  * 2 of the License, or (at your option) any later version.
  */

-#include <asm/m8260_pci.h>
-
 #define SIU_INT_IRQ1   ((uint)0x13 + CPM_IRQ_OFFSET)

 #ifndef _IO_BASE
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c
index cc9900d..c706871 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx.c
@@ -36,7 +36,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
 #include <asm/mpc8260.h>
 #include <asm/irq.h>
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 2d1b05b..c0a0c56 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -37,7 +37,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
 #include <asm/mpc8260.h>
 #include <asm/irq.h>
diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index 5b5cca6..6f749b7 100644
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -23,7 +23,6 @@
 #define __MACH_ADS8260_DEFS

 #include <linux/seq_file.h>
-#include <asm/ppcboot.h>

 /* For our show_cpuinfo hooks. */
 #define CPUINFO_VENDOR		"Freescale Semiconductor"
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 2c8e641..61e3f1c 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -32,7 +32,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 47ba544..6d06645 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -30,7 +30,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 4c9ff9c..f8aba9a 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -30,7 +30,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 84b5893..69970b9 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -38,7 +38,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 6a171e9..0402334 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -35,7 +35,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
 #include <asm/mpc85xx.h>
 #include <asm/irq.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index be25ecd..53830c9 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -38,7 +38,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
 #include <asm/mpc85xx.h>
 #include <asm/irq.h>
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index f169355..f00c8d1 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -36,13 +36,11 @@

 #include <asm/mmu.h>
 #include <asm/reg.h>
-#include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/machdep.h>
-#include <asm/bootinfo.h>
 #include <asm/time.h>
 #include <asm/prom.h>
 #include <asm/fs_pd.h>
@@ -55,7 +53,9 @@ struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
 #endif

 void m8xx_calibrate_decr(void);
+#ifdef CONFIG_8xx_WDT
 extern void m8xx_wdt_handler_install(bd_t *bp);
+#endif
 extern int cpm_pic_init(void);
 extern int cpm_get_irq(void);

diff --git a/arch/powerpc/platforms/8xx/mpc86xads.h b/arch/powerpc/platforms/8xx/mpc86xads.h
index 59bad2f..dd10cd2 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads.h
+++ b/arch/powerpc/platforms/8xx/mpc86xads.h
@@ -15,7 +15,6 @@
 #ifndef __ASM_MPC86XADS_H__
 #define __ASM_MPC86XADS_H__

-#include <asm/ppcboot.h>
 #include <sysdev/fsl_soc.h>

 /* U-Boot maps BCSR to 0xff080000 */
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index d881647..8f64f48 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -31,7 +31,6 @@
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/ppcboot.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/commproc.h>
diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h
index 7c31aec..14db124 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads.h
+++ b/arch/powerpc/platforms/8xx/mpc885ads.h
@@ -15,7 +15,6 @@
 #ifndef __ASM_MPC885ADS_H__
 #define __ASM_MPC885ADS_H__

-#include <asm/ppcboot.h>
 #include <sysdev/fsl_soc.h>

 /* U-Boot maps BCSR to 0xff080000 */
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index bd5ff7a..d3da385 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -32,7 +32,6 @@
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/ppcboot.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/commproc.h>
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index a137d13..10a4a4d 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -26,7 +26,6 @@
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/smp.h>
-#include <asm/residual.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/mpic.h>
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c
index d0bee9f..f7a4def 100644
--- a/arch/powerpc/platforms/embedded6xx/ls_uart.c
+++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c
@@ -5,7 +5,6 @@
 #include <linux/serial_8250.h>
 #include <asm/io.h>
 #include <asm/mpc10x.h>
-#include <asm/ppc_sys.h>
 #include <asm/prom.h>
 #include <asm/termbits.h>

diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index 9d73d02..cf66091 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -17,7 +17,6 @@
 #include <asm/prom.h>
 #include <asm/page.h>
 #include <asm/bootx.h>
-#include <asm/bootinfo.h>
 #include <asm/btext.h>
 #include <asm/io.h>

-- 
1.5.2.2

[PATCH 2/3 v2][POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need

From: Kumar Gala <hidden>
Date: 2007-08-18 17:09:41 

To build arch/powerpc without including asm-ppc/ we need these files
in asm-powerpc/

Moved some headers under arch/powerpc/platforms if they were only used by
platform files and fixed up the source file includes to match the new
locations

Signed-off-by: Kumar Gala <redacted>
---

Moved mpc10x.h, gg2.h, hydra.h into platforms. Removed new file diffs
from the patch.

 arch/powerpc/platforms/chrp/gg2.h                |   61 ++
 arch/powerpc/platforms/chrp/hydra.h              |  102 ++
 arch/powerpc/platforms/chrp/pci.c                |    4 +-
 arch/powerpc/platforms/chrp/setup.c              |    4 +-
 arch/powerpc/platforms/embedded6xx/linkstation.c |    3 +-
 arch/powerpc/platforms/embedded6xx/ls_uart.c     |    3 +-
 arch/powerpc/platforms/embedded6xx/mpc10x.h      |  180 ++++
 include/asm-powerpc/8xx_immap.h                  |  564 ++++++++++
 include/asm-powerpc/commproc.h                   |  692 ++++++++++++
 include/asm-powerpc/cpm2.h                       | 1248 ++++++++++++++++++++++
 include/asm-powerpc/highmem.h                    |  135 +++
 include/asm-powerpc/immap_cpm2.h                 |  648 +++++++++++
 include/asm-powerpc/kgdb.h                       |   57 +
 include/asm-powerpc/mpc52xx_psc.h                |  191 ++++
 14 files changed, 3886 insertions(+), 6 deletions(-)
 create mode 100644 arch/powerpc/platforms/chrp/gg2.h
 create mode 100644 arch/powerpc/platforms/chrp/hydra.h
 create mode 100644 arch/powerpc/platforms/embedded6xx/mpc10x.h
 create mode 100644 include/asm-powerpc/8xx_immap.h
 create mode 100644 include/asm-powerpc/commproc.h
 create mode 100644 include/asm-powerpc/cpm2.h
 create mode 100644 include/asm-powerpc/highmem.h
 create mode 100644 include/asm-powerpc/immap_cpm2.h
 create mode 100644 include/asm-powerpc/kgdb.h
 create mode 100644 include/asm-powerpc/mpc52xx_psc.h

diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 0c6dba9..fd80703 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -11,9 +11,7 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/irq.h>
-#include <asm/hydra.h>
 #include <asm/prom.h>
-#include <asm/gg2.h>
 #include <asm/machdep.h>
 #include <asm/sections.h>
 #include <asm/pci-bridge.h>
@@ -21,6 +19,8 @@
 #include <asm/rtas.h>

 #include "chrp.h"
+#include "gg2.h"
+#include "hydra.h"

 /* LongTrail */
 void __iomem *gg2_pci_config_base;
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index dde5ef4..03ccf1a 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -37,12 +37,10 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>
-#include <asm/gg2.h>
 #include <asm/pci-bridge.h>
 #include <asm/dma.h>
 #include <asm/machdep.h>
 #include <asm/irq.h>
-#include <asm/hydra.h>
 #include <asm/sections.h>
 #include <asm/time.h>
 #include <asm/i8259.h>
@@ -51,6 +49,8 @@
 #include <asm/xmon.h>

 #include "chrp.h"
+#include "gg2.h"
+#include "hydra.h"

 void rtas_indicator_progress(char *, unsigned short);

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 8c60e02..61ca02c 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -18,9 +18,10 @@
 #include <asm/time.h>
 #include <asm/prom.h>
 #include <asm/mpic.h>
-#include <asm/mpc10x.h>
 #include <asm/pci-bridge.h>

+#include "mpc10x.h"
+
 static struct mtd_partition linkstation_physmap_partitions[] = {
 	{
 		.name   = "mtd_firmimg",
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c
index f7a4def..0d9f150 100644
--- a/arch/powerpc/platforms/embedded6xx/ls_uart.c
+++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c
@@ -4,10 +4,11 @@
 #include <linux/serial_reg.h>
 #include <linux/serial_8250.h>
 #include <asm/io.h>
-#include <asm/mpc10x.h>
 #include <asm/prom.h>
 #include <asm/termbits.h>

+#include "mpc10x.h"
+
 static void __iomem *avr_addr;
 static unsigned long avr_clock;
-- 
1.5.2.2

[PATCH 3/3 v2][POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32

From: Kumar Gala <hidden>
Date: 2007-08-18 17:11:47 

We no longer have any dependancies on include/asm-ppc so we can get ride
of the makefile hacks to include it in the build process.

Signed-off-by: Kumar Gala <redacted>
---

Actually remove all the bits related to include fixup, not just comment
them out :)

 arch/powerpc/Makefile |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 6c1e36c..d6ab02e 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -63,8 +63,7 @@ endif

 LDFLAGS_vmlinux	:= -Bstatic

-# The -Iarch/$(ARCH)/include is temporary while we are merging
-CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include
+CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
 AFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)
 CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=none  -mcall-aixdesc
 CFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH) -ffixed-r2 -mmultiple
@@ -72,9 +71,6 @@ CPPFLAGS	+= $(CPPFLAGS-y)
 AFLAGS		+= $(AFLAGS-y)
 CFLAGS		+= -msoft-float -pipe $(CFLAGS-y)
 CPP		= $(CC) -E $(CFLAGS)
-# Temporary hack until we have migrated to asm-powerpc
-LINUXINCLUDE-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)/include
-LINUXINCLUDE    += $(LINUXINCLUDE-y)

 CHECKFLAGS	+= -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__

@@ -172,19 +168,8 @@ install:
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)

-archmrproper:
-	$(Q)rm -rf arch/$(ARCH)/include
-
 archprepare: checkbin

-ifeq ($(CONFIG_PPC32),y)
-# Temporary hack until we have migrated to asm-powerpc
-include/asm: arch/$(ARCH)/include/asm
-arch/$(ARCH)/include/asm: FORCE
-	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
-	$(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
-endif
-
 # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
 # to stdout and these checks are run even on install targets.
 TOUT	:= .tmp_gas_check
-- 
1.5.2.2

Re: [PATCH 3/3 v2][POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32

From: Paul Mackerras <hidden>
Date: 2007-08-20 05:54:08 

Kumar Gala writes:

We no longer have any dependancies on include/asm-ppc so we can get ride
of the makefile hacks to include it in the build process.
On 32-bit powermac, I get:

  CC [M]  drivers/macintosh/ans-lcd.o
/home/paulus/kernel/powerpc/drivers/macintosh/ans-lcd.c:17:25: error: asm/ans-lcd.h: No such file or directory

plus a whole pile of things undefined after that.

Paul.

Re: [PATCH 3/3 v2][POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32

From: Paul Mackerras <hidden>
Date: 2007-08-20 05:57:33 

I wrote:

On 32-bit powermac, I get:

  CC [M]  drivers/macintosh/ans-lcd.o
/home/paulus/kernel/powerpc/drivers/macintosh/ans-lcd.c:17:25: error: asm/ans-lcd.h: No such file or directory

plus a whole pile of things undefined after that.
And on mpc7448_hpc2 I get

  CC      arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.o
In file included from /home/paulus/kernel/powerpc/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c:43:
/home/paulus/kernel/powerpc/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h:19:25: error: asm/ppcboot.h: No such file or directory

Paul.

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: David Gibson <hidden>
Date: 2007-08-20 06:00:00 

On Sat, Aug 18, 2007 at 12:05:36PM -0500, Kumar Gala wrote:
This patch series removes the need for include/asm-ppc in the ARCH=powerpc
build for ppc32.  They exist in the following git tree:

  master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24

posting here for everyone else to see.

Updated with changes suggested by Arnd & Segher. (removal 82xx pci header
and moving some headers under platforms if not globally needed).
Nice!  I'm hoping the next step after this is to do the other way
around - make ARCH=ppc builds independent of things in arch/powerpc or
include/asm-powerpc, which is almost the more important change.

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

Re: [PATCH 3/3 v2][POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32

From: Kumar Gala <hidden>
Date: 2007-08-20 15:27:14 

On Aug 20, 2007, at 12:54 AM, Paul Mackerras wrote:

Kumar Gala writes:
quoted
We no longer have any dependancies on include/asm-ppc so we can  
get ride
of the makefile hacks to include it in the build process.
On 32-bit powermac, I get:

  CC [M]  drivers/macintosh/ans-lcd.o
/home/paulus/kernel/powerpc/drivers/macintosh/ans-lcd.c:17:25:  
error: asm/ans-lcd.h: No such file or directory

plus a whole pile of things undefined after that.
Fixed now.

- k

Re: [PATCH 3/3 v2][POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32

From: Kumar Gala <hidden>
Date: 2007-08-20 15:27:23 

On Aug 20, 2007, at 12:57 AM, Paul Mackerras wrote:

I wrote:
quoted
On 32-bit powermac, I get:

  CC [M]  drivers/macintosh/ans-lcd.o
/home/paulus/kernel/powerpc/drivers/macintosh/ans-lcd.c:17:25:  
error: asm/ans-lcd.h: No such file or directory

plus a whole pile of things undefined after that.
And on mpc7448_hpc2 I get

  CC      arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.o
In file included from /home/paulus/kernel/powerpc/arch/powerpc/ 
platforms/embedded6xx/mpc7448_hpc2.c:43:
/home/paulus/kernel/powerpc/arch/powerpc/platforms/embedded6xx/ 
mpc7448_hpc2.h:19:25: error: asm/ppcboot.h: No such file or directory
Darn, I thought I had gotten all those.  Fixed now.

- k

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Kumar Gala <hidden>
Date: 2007-08-20 15:32:43 

On Aug 20, 2007, at 1:00 AM, David Gibson wrote:

On Sat, Aug 18, 2007 at 12:05:36PM -0500, Kumar Gala wrote:
quoted
This patch series removes the need for include/asm-ppc in the  
ARCH=powerpc
build for ppc32.  They exist in the following git tree:

  master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
for-2.6.24

posting here for everyone else to see.

Updated with changes suggested by Arnd & Segher. (removal 82xx pci  
header
and moving some headers under platforms if not globally needed).
Nice!  I'm hoping the next step after this is to do the other way
around - make ARCH=ppc builds independent of things in arch/powerpc or
include/asm-powerpc, which is almost the more important change.
Maybe, hadn't thought about that case.  One thing at a time :)

Do we want to go and move stuff back out of arch/powerpc/kernel back  
into arch/ppc/kernel?  or just include files?

- k

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Josh Boyer <hidden>
Date: 2007-08-20 15:37:25 

On Mon, 20 Aug 2007 10:32:43 -0500
Kumar Gala [off-list ref] wrote:

On Aug 20, 2007, at 1:00 AM, David Gibson wrote:
quoted
On Sat, Aug 18, 2007 at 12:05:36PM -0500, Kumar Gala wrote:
quoted
This patch series removes the need for include/asm-ppc in the  
ARCH=powerpc
build for ppc32.  They exist in the following git tree:

  master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
for-2.6.24

posting here for everyone else to see.

Updated with changes suggested by Arnd & Segher. (removal 82xx pci  
header
and moving some headers under platforms if not globally needed).
Nice!  I'm hoping the next step after this is to do the other way
around - make ARCH=ppc builds independent of things in arch/powerpc or
include/asm-powerpc, which is almost the more important change.
Maybe, hadn't thought about that case.  One thing at a time :)

Do we want to go and move stuff back out of arch/powerpc/kernel back  
into arch/ppc/kernel?  or just include files?
What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left" to
port.

Also, making arch/ppc compile stand-alone again would be "wasted" work,
since it's going to die anyway.

josh

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Scott Wood <hidden>
Date: 2007-08-20 15:44:45 

Josh Boyer wrote:
On Mon, 20 Aug 2007 10:32:43 -0500
Kumar Gala [off-list ref] wrote:
quoted
Do we want to go and move stuff back out of arch/powerpc/kernel back  
into arch/ppc/kernel?  or just include files?

What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left" to
port.
The point would be to keep the two trees separate, so that one doesn't 
need to worry about breaking arch/ppc when making a change to arch/powerpc.

-Scott

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Josh Boyer <hidden>
Date: 2007-08-20 15:53:27 

On Mon, 20 Aug 2007 10:44:31 -0500
Scott Wood [off-list ref] wrote:

Josh Boyer wrote:
quoted
On Mon, 20 Aug 2007 10:32:43 -0500
Kumar Gala [off-list ref] wrote:
quoted
Do we want to go and move stuff back out of arch/powerpc/kernel back  
into arch/ppc/kernel?  or just include files?

What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left" to
port.
The point would be to keep the two trees separate, so that one doesn't 
need to worry about breaking arch/ppc when making a change to arch/powerpc.
Who worries about that? ;).

Ok, I can see that.  Still seems wasteful to me though.

josh

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Segher Boessenkool <hidden>
Date: 2007-08-20 22:12:47

quoted
What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left" to
port.
The point would be to keep the two trees separate, so that one doesn't
need to worry about breaking arch/ppc when making a change to 
arch/powerpc.
We should make arch/ppc as broken as possible so no one can
complain when it is finally removed.  I'll remove the config
from my auto-builder right now :-)


Segher

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: David Gibson <hidden>
Date: 2007-08-21 02:20:23 

On Mon, Aug 20, 2007 at 10:44:31AM -0500, Scott Wood wrote:
Josh Boyer wrote:
quoted
On Mon, 20 Aug 2007 10:32:43 -0500
Kumar Gala [off-list ref] wrote:
quoted
Do we want to go and move stuff back out of arch/powerpc/kernel back  
into arch/ppc/kernel?  or just include files?

What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left" to
port.
The point would be to keep the two trees separate, so that one
doesn't need to worry about breaking arch/ppc when making a change
to arch/powerpc.
Exactly so.  Having to be careful about not breaking arch/ppc when
doing cleanups for arch/powerpc is a pain in the bum.

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

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: David Gibson <hidden>
Date: 2007-08-21 03:02:34 

On Mon, Aug 20, 2007 at 09:47:30PM -0500, Josh Boyer wrote:
On Tue, 21 Aug 2007 11:47:07 +1000
David Gibson [off-list ref] wrote:
quoted
On Mon, Aug 20, 2007 at 10:44:31AM -0500, Scott Wood wrote:
quoted
Josh Boyer wrote:
quoted
On Mon, 20 Aug 2007 10:32:43 -0500
Kumar Gala [off-list ref] wrote:
quoted
Do we want to go and move stuff back out of arch/powerpc/kernel
back into arch/ppc/kernel?  or just include files?

What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left"
to port.
The point would be to keep the two trees separate, so that one
doesn't need to worry about breaking arch/ppc when making a change
to arch/powerpc.
Exactly so.  Having to be careful about not breaking arch/ppc when
doing cleanups for arch/powerpc is a pain in the bum.
How many times has that happened recently?  If it's fairly infrequent,
It's infrequent because I've shyed away from cleaning up shared files,
precisely because I'm afraid of breaking arch/ppc.

then just do the split when you're doing the arch/powerpc cleanup.  I'm
still not convinced that doing a wholesale split again is worth the
effort.

But then again, I'm not opposed either.  Particularly if someone else
is doing the work :).  It simply doesn't make tons of sense to my
feeble little brain.  Seems like that time could be spent better
elsewhere.

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

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Josh Boyer <hidden>
Date: 2007-08-21 03:43:11 

On Tue, 21 Aug 2007 11:47:07 +1000
David Gibson [off-list ref] wrote:

On Mon, Aug 20, 2007 at 10:44:31AM -0500, Scott Wood wrote:
quoted
Josh Boyer wrote:
quoted
On Mon, 20 Aug 2007 10:32:43 -0500
Kumar Gala [off-list ref] wrote:
quoted
Do we want to go and move stuff back out of arch/powerpc/kernel
back into arch/ppc/kernel?  or just include files?

What would be the point of doing that?  I would think we want the
opposite, in that we want to reuse as much of arch/powerpc during
arch/ppc compiles as possible.  Sort of shows how much is "left"
to port.
The point would be to keep the two trees separate, so that one
doesn't need to worry about breaking arch/ppc when making a change
to arch/powerpc.
Exactly so.  Having to be careful about not breaking arch/ppc when
doing cleanups for arch/powerpc is a pain in the bum.
How many times has that happened recently?  If it's fairly infrequent,
then just do the split when you're doing the arch/powerpc cleanup.  I'm
still not convinced that doing a wholesale split again is worth the
effort.

But then again, I'm not opposed either.  Particularly if someone else
is doing the work :).  It simply doesn't make tons of sense to my
feeble little brain.  Seems like that time could be spent better
elsewhere.

josh

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Arnd Bergmann <arnd@arndb.de>
Date: 2007-08-21 12:44:37 

On Tuesday 21 August 2007, David Gibson wrote:
=20
quoted
quoted
quoted
The point would be to keep the two trees separate, so that one
doesn't need to worry about breaking arch/ppc when making a change
to arch/powerpc.
=20
Exactly so. =A0Having to be careful about not breaking arch/ppc when
doing cleanups for arch/powerpc is a pain in the bum.
=20
How many times has that happened recently? =A0If it's fairly infrequent,
=20
It's infrequent because I've shyed away from cleaning up shared files,
precisely because I'm afraid of breaking arch/ppc.
How about splitting the files on a per-case bases then? There are at least
95 files that would need to be duplicated (again) to make ppc independent
from powerpc, and most of these files are about userland interfaces where
duplication makes no sense at all.

Some files in there (irq.h, ipic.h, dcr.h, i8259.h) already have large
parts hidden in #ifdef CONFIG_PPC_MERGE, so I guess for those it may
actually be interesting to split them in two again.

	Arnd <><

Re: [PATCH 0/3 v2] Remove need for include/asm-ppc

From: Josh Boyer <hidden>
Date: 2007-08-21 12:56:30 

On Tue, 21 Aug 2007 14:05:58 +0200
Arnd Bergmann [off-list ref] wrote:

On Tuesday 21 August 2007, David Gibson wrote:
quoted
=20
quoted
quoted
quoted
The point would be to keep the two trees separate, so that one
doesn't need to worry about breaking arch/ppc when making a change
to arch/powerpc.
=20
Exactly so. =C2=A0Having to be careful about not breaking arch/ppc =
when
quoted
quoted
quoted
doing cleanups for arch/powerpc is a pain in the bum.
=20
How many times has that happened recently? =C2=A0If it's fairly infre=
quent,
quoted
=20
It's infrequent because I've shyed away from cleaning up shared files,
precisely because I'm afraid of breaking arch/ppc.
=20
How about splitting the files on a per-case bases then? There are at least
95 files that would need to be duplicated (again) to make ppc independent
from powerpc, and most of these files are about userland interfaces where
duplication makes no sense at all.
Sure.  I said that in my previous reply too.

Some files in there (irq.h, ipic.h, dcr.h, i8259.h) already have large
parts hidden in #ifdef CONFIG_PPC_MERGE, so I guess for those it may
actually be interesting to split them in two again.
Yeah, for those it might.

josh
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help