* [PATCH 0/3] Remove need for include/asm-ppc
@ 2007-08-17 7:11 Kumar Gala
2007-08-17 7:12 ` [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc Kumar Gala
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Kumar Gala @ 2007-08-17 7:11 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
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.
- k
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc 2007-08-17 7:11 [PATCH 0/3] Remove need for include/asm-ppc Kumar Gala @ 2007-08-17 7:12 ` Kumar Gala 2007-08-17 7:14 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Kumar Gala 2007-08-17 12:30 ` [PATCH 0/3] Remove need for include/asm-ppc Josh Boyer 2007-08-17 17:06 ` Arnd Bergmann 2 siblings, 1 reply; 15+ messages in thread From: Kumar Gala @ 2007-08-17 7:12 UTC (permalink / raw) To: Paul Mackerras; +Cc: linuxppc-dev 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> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/kernel/setup_32.c | 2 -- arch/powerpc/platforms/52xx/lite5200.c | 1 - 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 - 19 files changed, 2 insertions(+), 21 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/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 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 7:12 ` [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc Kumar Gala @ 2007-08-17 7:14 ` Kumar Gala 2007-08-17 7:15 ` [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 Kumar Gala ` (2 more replies) 0 siblings, 3 replies; 15+ messages in thread From: Kumar Gala @ 2007-08-17 7:14 UTC (permalink / raw) To: Paul Mackerras; +Cc: linuxppc-dev To build arch/powerpc without including asm-ppc/ we need these files in asm-powerpc/ Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- include/asm-powerpc/8xx_immap.h | 564 +++++++++++++++++ include/asm-powerpc/commproc.h | 692 ++++++++++++++++++++ include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++++++++++++++ include/asm-powerpc/gg2.h | 61 ++ include/asm-powerpc/highmem.h | 135 ++++ include/asm-powerpc/hydra.h | 102 +++ include/asm-powerpc/immap_cpm2.h | 648 +++++++++++++++++++ include/asm-powerpc/kgdb.h | 57 ++ include/asm-powerpc/m8260_pci.h | 187 ++++++ include/asm-powerpc/mpc10x.h | 180 ++++++ include/asm-powerpc/mpc52xx_psc.h | 191 ++++++ 11 files changed, 4065 insertions(+), 0 deletions(-) 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/gg2.h create mode 100644 include/asm-powerpc/highmem.h create mode 100644 include/asm-powerpc/hydra.h create mode 100644 include/asm-powerpc/immap_cpm2.h create mode 100644 include/asm-powerpc/kgdb.h create mode 100644 include/asm-powerpc/m8260_pci.h create mode 100644 include/asm-powerpc/mpc10x.h create mode 100644 include/asm-powerpc/mpc52xx_psc.h [patch removed since I was just copying the asm-ppc variants to asm-powerpc] - k ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 2007-08-17 7:14 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Kumar Gala @ 2007-08-17 7:15 ` Kumar Gala 2007-08-17 8:13 ` Stephen Rothwell 2007-08-17 17:05 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Arnd Bergmann 2007-08-17 23:25 ` Segher Boessenkool 2 siblings, 1 reply; 15+ messages in thread From: Kumar Gala @ 2007-08-17 7:15 UTC (permalink / raw) To: Paul Mackerras; +Cc: linuxppc-dev 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 <galak@kernel.crashing.org> --- arch/powerpc/Makefile | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 6c1e36c..83a39a2 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,18 +168,15 @@ 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 +#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. -- 1.5.2.2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 2007-08-17 7:15 ` [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 Kumar Gala @ 2007-08-17 8:13 ` Stephen Rothwell 2007-08-17 12:55 ` Kumar Gala 0 siblings, 1 reply; 15+ messages in thread From: Stephen Rothwell @ 2007-08-17 8:13 UTC (permalink / raw) To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras [-- Attachment #1: Type: text/plain, Size: 1126 bytes --] On Fri, 17 Aug 2007 02:15:54 -0500 (CDT) Kumar Gala <galak@kernel.crashing.org> wrote: > > @@ -172,18 +168,15 @@ 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 > +#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 Why not just remove it? git will preserve it if we find a use for it. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 2007-08-17 8:13 ` Stephen Rothwell @ 2007-08-17 12:55 ` Kumar Gala 0 siblings, 0 replies; 15+ messages in thread From: Kumar Gala @ 2007-08-17 12:55 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linuxppc-dev, Paul Mackerras On Aug 17, 2007, at 3:13 AM, Stephen Rothwell wrote: > On Fri, 17 Aug 2007 02:15:54 -0500 (CDT) Kumar Gala > <galak@kernel.crashing.org> wrote: >> >> @@ -172,18 +168,15 @@ 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 >> +#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 > > Why not just remove it? git will preserve it if we find a use for it. oops, that was a debug foobar.. should have been removed. Now fixed, got to love git-commit --amend. - k ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 7:14 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Kumar Gala 2007-08-17 7:15 ` [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 Kumar Gala @ 2007-08-17 17:05 ` Arnd Bergmann 2007-08-17 17:42 ` Arnd Bergmann 2007-08-17 20:45 ` Scott Wood 2007-08-17 23:25 ` Segher Boessenkool 2 siblings, 2 replies; 15+ messages in thread From: Arnd Bergmann @ 2007-08-17 17:05 UTC (permalink / raw) To: linuxppc-dev On Friday 17 August 2007, Kumar Gala wrote: > To build arch/powerpc without including asm-ppc/ we need these files > in asm-powerpc/ Looks mostly good, but > include/asm-powerpc/8xx_immap.h | 564 +++++++++++++++++ > include/asm-powerpc/commproc.h | 692 ++++++++++++++++++++ > include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++++++++++++++ > include/asm-powerpc/gg2.h | 61 ++ > include/asm-powerpc/highmem.h | 135 ++++ > include/asm-powerpc/hydra.h | 102 +++ > include/asm-powerpc/immap_cpm2.h | 648 +++++++++++++++++++ > include/asm-powerpc/kgdb.h | 57 ++ > include/asm-powerpc/m8260_pci.h | 187 ++++++ The m8260_pci.h file is not namespace clean, it defines macros like PCI_CFG_ADDR_REG that are likely to create conflicts at some point of time. Since the only file including this header is arch/powerpc/platforms/82xx/m82xx_pci.h, I'd suggest merging the two, to make sure nobody can accidentally include it. Some of the other files also have minor style bitrot, e.g. use of volatile pointers, typedefs and CamelCase identifiers, though none of them should prevent the move. Arnd <>< ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 17:05 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Arnd Bergmann @ 2007-08-17 17:42 ` Arnd Bergmann 2007-08-17 20:45 ` Scott Wood 1 sibling, 0 replies; 15+ messages in thread From: Arnd Bergmann @ 2007-08-17 17:42 UTC (permalink / raw) To: linuxppc-dev On Friday 17 August 2007, Arnd Bergmann wrote: > The m8260_pci.h file is not namespace clean, it defines macros like > PCI_CFG_ADDR_REG that are likely to create conflicts at some point of > time. Since the only file including this header is > arch/powerpc/platforms/82xx/m82xx_pci.h, I'd suggest merging the two, > to make sure nobody can accidentally include it. Upon closer inspection, none of the definitions in this file are actually used in arch/powerpc, or should be. So, can we just kill that file, as you did with the others in your first patch? Arnd <>< ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 17:05 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Arnd Bergmann 2007-08-17 17:42 ` Arnd Bergmann @ 2007-08-17 20:45 ` Scott Wood 2007-08-17 20:50 ` Scott Wood 1 sibling, 1 reply; 15+ messages in thread From: Scott Wood @ 2007-08-17 20:45 UTC (permalink / raw) To: Arnd Bergmann; +Cc: linuxppc-dev On Fri, Aug 17, 2007 at 07:05:52PM +0200, Arnd Bergmann wrote: > The m8260_pci.h file is not namespace clean, it defines macros like > PCI_CFG_ADDR_REG that are likely to create conflicts at some point of > time. Since the only file including this header is > arch/powerpc/platforms/82xx/m82xx_pci.h, I'd suggest merging the two, > to make sure nobody can accidentally include it. Better yet, just get rid of that define -- nothing uses it AFAICT. -Scott ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 20:45 ` Scott Wood @ 2007-08-17 20:50 ` Scott Wood 0 siblings, 0 replies; 15+ messages in thread From: Scott Wood @ 2007-08-17 20:50 UTC (permalink / raw) To: Arnd Bergmann; +Cc: linuxppc-dev On Fri, Aug 17, 2007 at 03:45:02PM -0500, Scott Wood wrote: > On Fri, Aug 17, 2007 at 07:05:52PM +0200, Arnd Bergmann wrote: > > The m8260_pci.h file is not namespace clean, it defines macros like > > PCI_CFG_ADDR_REG that are likely to create conflicts at some point of > > time. Since the only file including this header is > > arch/powerpc/platforms/82xx/m82xx_pci.h, I'd suggest merging the two, > > to make sure nobody can accidentally include it. > > Better yet, just get rid of that define -- nothing uses it AFAICT. To elaborate, I grepped for all of the symbols defined in m8260_pci.h, and none get any hits in arch/powerpc. -Scott ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 7:14 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Kumar Gala 2007-08-17 7:15 ` [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 Kumar Gala 2007-08-17 17:05 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Arnd Bergmann @ 2007-08-17 23:25 ` Segher Boessenkool 2007-08-18 5:40 ` Kumar Gala 2 siblings, 1 reply; 15+ messages in thread From: Segher Boessenkool @ 2007-08-17 23:25 UTC (permalink / raw) To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras > include/asm-powerpc/8xx_immap.h | 564 +++++++++++++++++ > include/asm-powerpc/commproc.h | 692 ++++++++++++++++++++ > include/asm-powerpc/cpm2.h | 1248 > +++++++++++++++++++++++++++++++++++++ > include/asm-powerpc/gg2.h | 61 ++ > include/asm-powerpc/highmem.h | 135 ++++ > include/asm-powerpc/hydra.h | 102 +++ > include/asm-powerpc/immap_cpm2.h | 648 +++++++++++++++++++ > include/asm-powerpc/kgdb.h | 57 ++ > include/asm-powerpc/m8260_pci.h | 187 ++++++ > include/asm-powerpc/mpc10x.h | 180 ++++++ > include/asm-powerpc/mpc52xx_psc.h | 191 ++++++ Can't we move most of this to the dir where they are used, instead? Segher ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-17 23:25 ` Segher Boessenkool @ 2007-08-18 5:40 ` Kumar Gala 0 siblings, 0 replies; 15+ messages in thread From: Kumar Gala @ 2007-08-18 5:40 UTC (permalink / raw) To: Segher Boessenkool; +Cc: linuxppc-dev, Paul Mackerras On Aug 17, 2007, at 6:25 PM, Segher Boessenkool wrote: >> include/asm-powerpc/8xx_immap.h | 564 +++++++++++++++++ >> include/asm-powerpc/commproc.h | 692 ++++++++++++++++++++ >> include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++ >> ++++++++++++ >> include/asm-powerpc/gg2.h | 61 ++ >> include/asm-powerpc/highmem.h | 135 ++++ >> include/asm-powerpc/hydra.h | 102 +++ >> include/asm-powerpc/immap_cpm2.h | 648 +++++++++++++++++++ >> include/asm-powerpc/kgdb.h | 57 ++ >> include/asm-powerpc/m8260_pci.h | 187 ++++++ >> include/asm-powerpc/mpc10x.h | 180 ++++++ >> include/asm-powerpc/mpc52xx_psc.h | 191 ++++++ > > Can't we move most of this to the dir where they are used, > instead? The following are shared between arch/powerpc code and drivers: include/asm-powerpc/8xx_immap.h | 564 +++++++++++++++++ include/asm-powerpc/commproc.h | 692 ++++++++++++++++++++ include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++++ ++++++++++ include/asm-powerpc/immap_cpm2.h | 648 +++++++++++++++++++ include/asm-powerpc/mpc52xx_psc.h | 191 ++++++ These could possibly move, I'll look into it: include/asm-powerpc/gg2.h | 61 ++ [into platforms/chrp] include/asm-powerpc/hydra.h | 102 +++ [into platforms/chrp] include/asm-powerpc/kgdb.h | 57 ++ [not sure, maybe leave here for now] include/asm-powerpc/mpc10x.h | 180 ++++++ [into platforms/ embedded6xx] Needs to live in include/asm-powerpc: include/asm-powerpc/highmem.h | 135 ++++ Will kill this one per Scott/Arnd: include/asm-powerpc/m8260_pci.h | 187 ++++++ - k ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] Remove need for include/asm-ppc 2007-08-17 7:11 [PATCH 0/3] Remove need for include/asm-ppc Kumar Gala 2007-08-17 7:12 ` [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc Kumar Gala @ 2007-08-17 12:30 ` Josh Boyer 2007-08-17 12:56 ` Kumar Gala 2007-08-17 17:06 ` Arnd Bergmann 2 siblings, 1 reply; 15+ messages in thread From: Josh Boyer @ 2007-08-17 12:30 UTC (permalink / raw) To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras On Fri, 17 Aug 2007 02:11:58 -0500 (CDT) Kumar Gala <galak@kernel.crashing.org> 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. Did you happen to try building 44x with this series applied? If not, I'll give it a whirl later today. josh ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] Remove need for include/asm-ppc 2007-08-17 12:30 ` [PATCH 0/3] Remove need for include/asm-ppc Josh Boyer @ 2007-08-17 12:56 ` Kumar Gala 0 siblings, 0 replies; 15+ messages in thread From: Kumar Gala @ 2007-08-17 12:56 UTC (permalink / raw) To: Josh Boyer; +Cc: linuxppc-dev, Paul Mackerras On Aug 17, 2007, at 7:30 AM, Josh Boyer wrote: > On Fri, 17 Aug 2007 02:11:58 -0500 (CDT) > Kumar Gala <galak@kernel.crashing.org> 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. > > Did you happen to try building 44x with this series applied? If not, > I'll give it a whirl later today. I built ebony w/o any issues. - k ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] Remove need for include/asm-ppc 2007-08-17 7:11 [PATCH 0/3] Remove need for include/asm-ppc Kumar Gala 2007-08-17 7:12 ` [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc Kumar Gala 2007-08-17 12:30 ` [PATCH 0/3] Remove need for include/asm-ppc Josh Boyer @ 2007-08-17 17:06 ` Arnd Bergmann 2 siblings, 0 replies; 15+ messages in thread From: Arnd Bergmann @ 2007-08-17 17:06 UTC (permalink / raw) To: linuxppc-dev; +Cc: Paul Mackerras On Friday 17 August 2007, Kumar Gala wrote: > This patch series removes the need for include/asm-ppc in the ARCH=3Dpowe= rpc > build for ppc32. =A0They exist in the following git tree: >=20 > =A0 master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6= =2E24 >=20 > posting here for everyone else to see. Cool stuff. At one point I started doing a partial version of your patch 1/= 3, but gave up soon when it grew too big. Arnd <>< ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2007-08-18 5:38 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-08-17 7:11 [PATCH 0/3] Remove need for include/asm-ppc Kumar Gala 2007-08-17 7:12 ` [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc Kumar Gala 2007-08-17 7:14 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Kumar Gala 2007-08-17 7:15 ` [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 Kumar Gala 2007-08-17 8:13 ` Stephen Rothwell 2007-08-17 12:55 ` Kumar Gala 2007-08-17 17:05 ` [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need Arnd Bergmann 2007-08-17 17:42 ` Arnd Bergmann 2007-08-17 20:45 ` Scott Wood 2007-08-17 20:50 ` Scott Wood 2007-08-17 23:25 ` Segher Boessenkool 2007-08-18 5:40 ` Kumar Gala 2007-08-17 12:30 ` [PATCH 0/3] Remove need for include/asm-ppc Josh Boyer 2007-08-17 12:56 ` Kumar Gala 2007-08-17 17:06 ` Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).