Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3dfaa762b59743719f00f2dc2f559de59f5502f7

Authored by Arnd Bergmann
Committed by Kumar Gala
1 parent 143056013f

[POWERPC] kill isa_{io,mem}_base definitions for !PCI 

When CONFIG_PCI is disabled, the definitions for isa_io_base,
isa_mem_base and pci_dram_offset are entirely unused, but they
can result in link failure because they are defined in multiple
places.

The easiest fix is to just remove all these definitions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Showing 13 changed files with 0 additions and 69 deletions Side-by-side Diff

arch/powerpc/platforms/83xx/mpc8313_rdb.c
Diff comments   View file @ 3dfaa76
... ... @@ -28,11 +28,6 @@
28 28 #define DBG(fmt...)
29 29 #endif
30 30  
31   -#ifndef CONFIG_PCI
32   -unsigned long isa_io_base = 0;
33   -unsigned long isa_mem_base = 0;
34   -#endif
35   -
36 31 /* ************************************************************************
37 32 *
38 33 * Setup the architecture
arch/powerpc/platforms/83xx/mpc832x_mds.c
Diff comments   View file @ 3dfaa76
... ... @@ -49,11 +49,6 @@
49 49 #define DBG(fmt...)
50 50 #endif
51 51  
52   -#ifndef CONFIG_PCI
53   -unsigned long isa_io_base = 0;
54   -unsigned long isa_mem_base = 0;
55   -#endif
56   -
57 52 static u8 *bcsr_regs = NULL;
58 53  
59 54 /* ************************************************************************
arch/powerpc/platforms/83xx/mpc832x_rdb.c
Diff comments   View file @ 3dfaa76
... ... @@ -32,11 +32,6 @@
32 32 #define DBG(fmt...)
33 33 #endif
34 34  
35   -#ifndef CONFIG_PCI
36   -unsigned long isa_io_base = 0;
37   -unsigned long isa_mem_base = 0;
38   -#endif
39   -
40 35 /* ************************************************************************
41 36 *
42 37 * Setup the architecture
arch/powerpc/platforms/83xx/mpc834x_itx.c
Diff comments   View file @ 3dfaa76
... ... @@ -38,11 +38,6 @@
38 38  
39 39 #include "mpc83xx.h"
40 40  
41   -#ifndef CONFIG_PCI
42   -unsigned long isa_io_base = 0;
43   -unsigned long isa_mem_base = 0;
44   -#endif
45   -
46 41 /* ************************************************************************
47 42 *
48 43 * Setup the architecture
arch/powerpc/platforms/83xx/mpc834x_mds.c
Diff comments   View file @ 3dfaa76
... ... @@ -38,11 +38,6 @@
38 38  
39 39 #include "mpc83xx.h"
40 40  
41   -#ifndef CONFIG_PCI
42   -unsigned long isa_io_base = 0;
43   -unsigned long isa_mem_base = 0;
44   -#endif
45   -
46 41 #define BCSR5_INT_USB 0x02
47 42 /* Note: This is only for PB, not for PB+PIB
48 43 * On PB only port0 is connected using ULPI */
arch/powerpc/platforms/83xx/mpc836x_mds.c
Diff comments   View file @ 3dfaa76
... ... @@ -55,11 +55,6 @@
55 55 #define DBG(fmt...)
56 56 #endif
57 57  
58   -#ifndef CONFIG_PCI
59   -unsigned long isa_io_base = 0;
60   -unsigned long isa_mem_base = 0;
61   -#endif
62   -
63 58 static u8 *bcsr_regs = NULL;
64 59  
65 60 /* ************************************************************************
arch/powerpc/platforms/85xx/mpc85xx_ads.c
Diff comments   View file @ 3dfaa76
... ... @@ -38,11 +38,6 @@
38 38 #include <asm/fs_pd.h>
39 39 #endif
40 40  
41   -#ifndef CONFIG_PCI
42   -unsigned long isa_io_base = 0;
43   -unsigned long isa_mem_base = 0;
44   -#endif
45   -
46 41 #ifdef CONFIG_PCI
47 42 static int mpc85xx_exclude_device(u_char bus, u_char devfn)
48 43 {
arch/powerpc/platforms/85xx/mpc85xx_cds.c
Diff comments   View file @ 3dfaa76
... ... @@ -47,11 +47,6 @@
47 47 #include <sysdev/fsl_soc.h>
48 48 #include "mpc85xx.h"
49 49  
50   -#ifndef CONFIG_PCI
51   -unsigned long isa_io_base = 0;
52   -unsigned long isa_mem_base = 0;
53   -#endif
54   -
55 50 static int cds_pci_slot = 2;
56 51 static volatile u8 *cadmus;
57 52  
arch/powerpc/platforms/85xx/mpc85xx_mds.c
Diff comments   View file @ 3dfaa76
... ... @@ -59,11 +59,6 @@
59 59 #define DBG(fmt...)
60 60 #endif
61 61  
62   -#ifndef CONFIG_PCI
63   -unsigned long isa_io_base = 0;
64   -unsigned long isa_mem_base = 0;
65   -#endif
66   -
67 62 /* ************************************************************************
68 63 *
69 64 * Setup the architecture
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
Diff comments   View file @ 3dfaa76
... ... @@ -44,13 +44,6 @@
44 44 #define DBG(fmt...) do { } while(0)
45 45 #endif
46 46  
47   -#ifndef CONFIG_PCI
48   -unsigned long isa_io_base = 0;
49   -unsigned long isa_mem_base = 0;
50   -unsigned long pci_dram_offset = 0;
51   -#endif
52   -
53   -
54 47 #ifdef CONFIG_PCI
55 48 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
56 49 {
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
Diff comments   View file @ 3dfaa76
... ... @@ -54,12 +54,6 @@
54 54  
55 55 #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
56 56  
57   -#ifndef CONFIG_PCI
58   -isa_io_base = MPC7448_HPC2_ISA_IO_BASE;
59   -isa_mem_base = MPC7448_HPC2_ISA_MEM_BASE;
60   -pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;
61   -#endif
62   -
63 57 extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
64 58  
65 59 int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
Diff comments   View file @ 3dfaa76
... ... @@ -18,10 +18,5 @@
18 18  
19 19 #include <asm/ppcboot.h>
20 20  
21   -/* Base Addresses for the PCI bus
22   - */
23   -#define MPC7448_HPC2_PCI_MEM_OFFSET (0x00000000)
24   -#define MPC7448_HPC2_ISA_IO_BASE (0x00000000)
25   -#define MPC7448_HPC2_ISA_MEM_BASE (0x00000000)
26 21 #endif /* __PPC_PLATFORMS_MPC7448_HPC2_H */
include/asm-powerpc/mpc86xx.h
Diff comments   View file @ 3dfaa76
... ... @@ -19,12 +19,6 @@
19 19  
20 20 #ifdef CONFIG_PPC_86xx
21 21  
22   -#define _IO_BASE isa_io_base
23   -#define _ISA_MEM_BASE isa_mem_base
24   -#ifdef CONFIG_PCI
25   -#define PCI_DRAM_OFFSET pci_dram_offset
26   -#endif
27   -
28 22 #define CPU0_BOOT_RELEASE 0x01000000
29 23 #define CPU1_BOOT_RELEASE 0x02000000
30 24 #define CPU_ALL_RELEASED (CPU0_BOOT_RELEASE | CPU1_BOOT_RELEASE)