From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: sfr@canb.auug.org.au To: paulus@samba.org Subject: [PATCH 03/15] powerpc: move asm/mpc8xx.h Date: Wed, 05 Apr 2006 15:10:37 +1000 Message-Id: <11442138543837-git-send-email-sfr@canb.auug.org.au> In-Reply-To: <11442138494042-git-send-email-sfr@canb.auug.org.au> Cc: linuxppc-dev@ozlabs.org, Stephen Rothwell Reply-To: sfr@canb.auug.org.au List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Stephen Rothwell Since files in arch/powerpc now depend on asm/mpc8xx.h, move it to include/asm_powerpc. Signed-off-by: Stephen Rothwell --- include/asm-powerpc/mpc8xx.h | 126 ++++++++++++++++++++++++++++++++++++++++++ include/asm-ppc/mpc8xx.h | 126 ------------------------------------------ 2 files changed, 126 insertions(+), 126 deletions(-) create mode 100644 include/asm-powerpc/mpc8xx.h delete mode 100644 include/asm-ppc/mpc8xx.h f42aaf39f24784b0beecc91de6dc78f600d3b8cd diff --git a/include/asm-powerpc/mpc8xx.h b/include/asm-powerpc/mpc8xx.h new file mode 100644 index 0000000..db027e7 --- /dev/null +++ b/include/asm-powerpc/mpc8xx.h @@ -0,0 +1,126 @@ +#ifndef _ASM_POWERPC_MPC8XX_H +#define _ASM_POWERPC_MPC8XX_H + +/* This is the single file included by all MPC8xx build options. + * Since there are many different boards and no standard configuration, + * we have a unique include file for each. Rather than change every + * file that has to include MPC8xx configuration, they all include + * this one and the configuration switching is done here. + */ + +#ifdef __KERNEL__ + +#ifdef CONFIG_8xx + +#ifdef CONFIG_MBX +#include +#endif + +#ifdef CONFIG_FADS +#include +#endif + +#ifdef CONFIG_RPXLITE +#include +#endif + +#ifdef CONFIG_BSEIP +#include +#endif + +#ifdef CONFIG_RPXCLASSIC +#include +#endif + +#if defined(CONFIG_TQM8xxL) +#include +#endif + +#if defined(CONFIG_IVMS8) || defined(CONFIG_IVML24) +#include +#endif + +#if defined(CONFIG_HERMES_PRO) +#include +#endif + +#if defined(CONFIG_IP860) +#include +#endif + +#if defined(CONFIG_LWMON) +#include +#endif + +#if defined(CONFIG_PCU_E) +#include +#endif + +#if defined(CONFIG_CCM) +#include +#endif + +#if defined(CONFIG_LANTEC) +#include +#endif + +#if defined(CONFIG_MPC885ADS) +#include +#endif + +/* Currently, all 8xx boards that support a processor to PCI/ISA bridge + * use the same memory map. + */ +#if 0 +#if defined(CONFIG_PCI) && defined(PCI_ISA_IO_ADDR) +#define _IO_BASE PCI_ISA_IO_ADDR +#define _ISA_MEM_BASE PCI_ISA_MEM_ADDR +#define PCI_DRAM_OFFSET 0x80000000 +#else +#define _IO_BASE 0 +#define _ISA_MEM_BASE 0 +#define PCI_DRAM_OFFSET 0 +#endif +#else +#if !defined(_IO_BASE) /* defined in board specific header */ +#define _IO_BASE 0 +#endif +#define _ISA_MEM_BASE 0 +#define PCI_DRAM_OFFSET 0 +#endif + +#ifndef __ASSEMBLY__ +/* The "residual" data board information structure the boot loader + * hands to us. + */ +extern unsigned char __res[]; + +struct pt_regs; + +enum ppc_sys_devices { + MPC8xx_CPM_FEC1, + MPC8xx_CPM_FEC2, + MPC8xx_CPM_I2C, + MPC8xx_CPM_SCC1, + MPC8xx_CPM_SCC2, + MPC8xx_CPM_SCC3, + MPC8xx_CPM_SCC4, + MPC8xx_CPM_SPI, + MPC8xx_CPM_MCC1, + MPC8xx_CPM_MCC2, + MPC8xx_CPM_SMC1, + MPC8xx_CPM_SMC2, + MPC8xx_CPM_USB, + NUM_PPC_SYS_DEVS, +}; + +#define PPC_PIN_SIZE (24 * 1024 * 1024) /* 24Mbytes of data pinned */ + +#ifndef BOARD_CHIP_NAME +#define BOARD_CHIP_NAME "" +#endif + +#endif /* !__ASSEMBLY__ */ +#endif /* CONFIG_8xx */ +#endif /* __KERNEL__ */ +#endif /* _ASM_POWERPC_MPC8XX_H */ diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h deleted file mode 100644 index 3515a7f..0000000 --- a/include/asm-ppc/mpc8xx.h +++ /dev/null @@ -1,126 +0,0 @@ -/* This is the single file included by all MPC8xx build options. - * Since there are many different boards and no standard configuration, - * we have a unique include file for each. Rather than change every - * file that has to include MPC8xx configuration, they all include - * this one and the configuration switching is done here. - */ -#ifdef __KERNEL__ -#ifndef __CONFIG_8xx_DEFS -#define __CONFIG_8xx_DEFS - -#include - -#ifdef CONFIG_8xx - -#ifdef CONFIG_MBX -#include -#endif - -#ifdef CONFIG_FADS -#include -#endif - -#ifdef CONFIG_RPXLITE -#include -#endif - -#ifdef CONFIG_BSEIP -#include -#endif - -#ifdef CONFIG_RPXCLASSIC -#include -#endif - -#if defined(CONFIG_TQM8xxL) -#include -#endif - -#if defined(CONFIG_IVMS8) || defined(CONFIG_IVML24) -#include -#endif - -#if defined(CONFIG_HERMES_PRO) -#include -#endif - -#if defined(CONFIG_IP860) -#include -#endif - -#if defined(CONFIG_LWMON) -#include -#endif - -#if defined(CONFIG_PCU_E) -#include -#endif - -#if defined(CONFIG_CCM) -#include -#endif - -#if defined(CONFIG_LANTEC) -#include -#endif - -#if defined(CONFIG_MPC885ADS) -#include -#endif - -/* Currently, all 8xx boards that support a processor to PCI/ISA bridge - * use the same memory map. - */ -#if 0 -#if defined(CONFIG_PCI) && defined(PCI_ISA_IO_ADDR) -#define _IO_BASE PCI_ISA_IO_ADDR -#define _ISA_MEM_BASE PCI_ISA_MEM_ADDR -#define PCI_DRAM_OFFSET 0x80000000 -#else -#define _IO_BASE 0 -#define _ISA_MEM_BASE 0 -#define PCI_DRAM_OFFSET 0 -#endif -#else -#if !defined(_IO_BASE) /* defined in board specific header */ -#define _IO_BASE 0 -#endif -#define _ISA_MEM_BASE 0 -#define PCI_DRAM_OFFSET 0 -#endif - -#ifndef __ASSEMBLY__ -/* The "residual" data board information structure the boot loader - * hands to us. - */ -extern unsigned char __res[]; - -struct pt_regs; - -enum ppc_sys_devices { - MPC8xx_CPM_FEC1, - MPC8xx_CPM_FEC2, - MPC8xx_CPM_I2C, - MPC8xx_CPM_SCC1, - MPC8xx_CPM_SCC2, - MPC8xx_CPM_SCC3, - MPC8xx_CPM_SCC4, - MPC8xx_CPM_SPI, - MPC8xx_CPM_MCC1, - MPC8xx_CPM_MCC2, - MPC8xx_CPM_SMC1, - MPC8xx_CPM_SMC2, - MPC8xx_CPM_USB, - NUM_PPC_SYS_DEVS, -}; - -#define PPC_PIN_SIZE (24 * 1024 * 1024) /* 24Mbytes of data pinned */ - -#ifndef BOARD_CHIP_NAME -#define BOARD_CHIP_NAME "" -#endif - -#endif /* !__ASSEMBLY__ */ -#endif /* CONFIG_8xx */ -#endif /* __CONFIG_8xx_DEFS */ -#endif /* __KERNEL__ */ -- 1.2.4