From c9c06167e7933d93a6e396174c68abf242294abb Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 05:27:25 +0000 Subject: Merge with Linux 2.4.0-test12. --- include/asm-arm/arch-ebsa285/hardware.h | 7 +++++-- include/asm-arm/arch-ebsa285/memory.h | 6 ++++++ include/asm-arm/arch-ebsa285/processor.h | 30 ------------------------------ 3 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 include/asm-arm/arch-ebsa285/processor.h (limited to 'include/asm-arm/arch-ebsa285') diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/include/asm-arm/arch-ebsa285/hardware.h index 44747379c..21157a5c3 100644 --- a/include/asm-arm/arch-ebsa285/hardware.h +++ b/include/asm-arm/arch-ebsa285/hardware.h @@ -94,8 +94,6 @@ #define XBUS_SWITCH_J17_11 ((*XBUS_SWITCH) & (1 << 5)) #define XBUS_SWITCH_J17_9 ((*XBUS_SWITCH) & (1 << 6)) -#define PARAMS_OFFSET 0x0100 - #define FLUSH_BASE_PHYS 0x50000000 #define UNCACHEABLE_ADDR (ARMCSR_BASE + 0x108) @@ -133,4 +131,9 @@ extern int gpio_read(void); extern void cpld_modify(int mask, int set); #endif +#define pcibios_assign_all_busses() 1 + +#define PCIBIOS_MIN_IO 0x6000 +#define PCIBIOS_MIN_MEM 0x40000000 + #endif diff --git a/include/asm-arm/arch-ebsa285/memory.h b/include/asm-arm/arch-ebsa285/memory.h index 98172671f..41e730cea 100644 --- a/include/asm-arm/arch-ebsa285/memory.h +++ b/include/asm-arm/arch-ebsa285/memory.h @@ -66,6 +66,12 @@ extern unsigned long __bus_to_virt(unsigned long); #define TASK_SIZE_26 (0x04000000UL) #define PHYS_OFFSET (0x00000000UL) +/* + * This decides where the kernel will search for a free chunk of vm + * space during mmap's. + */ +#define TASK_UNMAPPED_BASE (TASK_SIZE / 3) + /* * The DRAM is always contiguous. */ diff --git a/include/asm-arm/arch-ebsa285/processor.h b/include/asm-arm/arch-ebsa285/processor.h deleted file mode 100644 index 1c0561018..000000000 --- a/include/asm-arm/arch-ebsa285/processor.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * linux/include/asm-arm/arch-ebsa110/processor.h - * - * Copyright (C) 1996-1999 Russell King - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Changelog: - * 21-Mar-1999 RMK Added asm/arch/memory.h - */ - -#ifndef __ASM_ARCH_PROCESSOR_H -#define __ASM_ARCH_PROCESSOR_H - -/* - * Bus types - */ -#define EISA_bus 0 -#define EISA_bus__is_a_macro /* for versions in ksyms.c */ -#define MCA_bus 0 -#define MCA_bus__is_a_macro /* for versions in ksyms.c */ - -/* This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ -#define TASK_UNMAPPED_BASE (TASK_SIZE / 3) - -#endif -- cgit v1.2.3