diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-ppc/io.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-ppc/io.h')
| -rw-r--r-- | include/asm-ppc/io.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 9e2f23c3c..e52ddf0be 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -5,6 +5,8 @@ #include <asm/page.h> #include <asm/byteorder.h> +#define KERNELBASE 0xc0000000 + /* from the Carolina Technical Spec -- Cort */ #define IBM_ACORN 0x82A #define SIO_CONFIG_RA 0x398 @@ -18,7 +20,6 @@ #define SLOW_DOWN_IO -#define PMAC_ISA_IO_BASE 0 #define PMAC_ISA_MEM_BASE 0 #define PMAC_PCI_DRAM_OFFSET 0 #define CHRP_ISA_IO_BASE 0xf8000000 @@ -43,11 +44,18 @@ #endif /* CONFIG_CHRP */ #ifdef CONFIG_PMAC -#define _IO_BASE PMAC_ISA_IO_BASE +extern unsigned long isa_io_base; +#define _IO_BASE isa_io_base /* well, PCI i/o base really */ #define _ISA_MEM_BASE PMAC_ISA_MEM_BASE #define PCI_DRAM_OFFSET PMAC_PCI_DRAM_OFFSET #endif /* CONFIG_PMAC */ +#ifdef CONFIG_MBX +#define _IO_BASE 0 +#define _ISA_MEM_BASE 0 +#define PCI_DRAM_OFFSET 0x80000000 +#endif /* CONFIG_MBX8xx */ + #else /* CONFIG_MACH_SPECIFIC */ extern unsigned long isa_io_base; #define _IO_BASE isa_io_base @@ -122,8 +130,11 @@ extern inline void * bus_to_virt(unsigned long address) * Map in an area of physical address space, for accessing * I/O devices etc. */ +extern void *__ioremap(unsigned long address, unsigned long size, + unsigned long flags); extern void *ioremap(unsigned long address, unsigned long size); -extern void iounmap(unsigned long *addr); +extern void iounmap(void *addr); +extern unsigned long iopa(unsigned long addr); /* * Change virtual addresses to physical addresses and vv, for |