Commit e055d5bf authored by Adrian Bunk's avatar Adrian Bunk Committed by Russell King
Browse files

[ARM] 5015/1: arm: remove ARCH_CO285 



Trying to compile a kerel for ARCH_CO285 fails with the following error:

<--  snip  -->

...
  CC      arch/arm/mach-footbridge/dc21285.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:
In function 'dc21285_base_address':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:54: error: 'PCICFG0_BASE' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:54: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:54: error: for each function it appears in.)
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:57: error: 'PCICFG1_BASE' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:
In function 'dc21285_scan_bus':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/arm/mach-footbridge/dc21285.c:286: error: implicit declaration of function 'pci_scan_bus'
...
make[2]: *** [arch/arm/mach-footbridge/dc21285.o] Error 1

<--  snip  -->

This does not seem to be a recent breakage.

The ARCH_CO285 support is old - kernel 2.2.0 contains first traces of
it, an it seems to have been pretty complete in later 2.2 kernels.

Since it seems to be completely dead code now this patch therefore
removes it.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4b119e21

arch/arm/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -232,14 +232,6 @@ config ARCH_CLPS711X 
	help

	  Support for Cirrus Logic 711x/721x based boards.



config ARCH_CO285

	bool "Co-EBSA285"

	select FOOTBRIDGE

	select FOOTBRIDGE_ADDIN

	select HAVE_IDE

	help

	  Support for Intel's EBSA285 companion chip.



config ARCH_EBSA110

	bool "EBSA-110"

	select ISA
@@ -784,7 +776,7 @@ source "mm/Kconfig" 


config LEDS

	bool "Timer and CPU usage LEDs"

	depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \

	depends on ARCH_CDB89712 || ARCH_EBSA110 || \

		   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \

		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

arch/arm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ textofs-y := 0x00008000 
  incdir-$(CONFIG_ARCH_CLPS7500)   := cl7500

 machine-$(CONFIG_FOOTBRIDGE)	   := footbridge

  incdir-$(CONFIG_FOOTBRIDGE)	   := ebsa285

 machine-$(CONFIG_ARCH_CO285)	   := footbridge

  incdir-$(CONFIG_ARCH_CO285)	   := ebsa285

 machine-$(CONFIG_ARCH_SHARK)	   := shark

 machine-$(CONFIG_ARCH_SA1100)	   := sa1100

ifeq ($(CONFIG_ARCH_SA1100),y)

arch/arm/mach-footbridge/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -14,12 +14,10 @@ pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o 
pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o

pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o



leds-$(CONFIG_ARCH_CO285) += ebsa285-leds.o

leds-$(CONFIG_ARCH_EBSA285) += ebsa285-leds.o

leds-$(CONFIG_ARCH_NETWINDER) += netwinder-leds.o



obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o

obj-$(CONFIG_ARCH_CO285) += co285.o dc21285-timer.o

obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o

obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o

obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o

arch/arm/mach-footbridge/co285.c

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-footbridge/co285.c

 *

 * CO285 machine fixup

 */

#include <linux/init.h>



#include <asm/hardware/dec21285.h>

#include <asm/mach-types.h>



#include <asm/mach/arch.h>



#include "common.h"



static void __init

fixup_coebsa285(struct machine_desc *desc, struct tag *tags,

		char **cmdline, struct meminfo *mi)

{

	extern unsigned long boot_memory_end;

	extern char boot_command_line[];



	mi->nr_banks      = 1;

	mi->bank[0].start = PHYS_OFFSET;

	mi->bank[0].size  = boot_memory_end;

	mi->bank[0].node  = 0;



	*cmdline = boot_command_line;

}



MACHINE_START(CO285, "co-EBSA285")

	/* Maintainer: Mark van Doesburg */

	.phys_io	= DC21285_ARMCSR_BASE,

	.io_pg_offst	= ((0x7cf00000) >> 18) & 0xfffc,

	.fixup		= fixup_coebsa285,

	.map_io		= footbridge_map_io,

	.init_irq	= footbridge_init_irq,

	.timer		= &footbridge_timer,

MACHINE_END

arch/arm/mach-footbridge/common.c

+0 −21
Original line number Diff line number Diff line
@@ -177,25 +177,6 @@ static struct map_desc ebsa285_host_io_desc[] __initdata = { 
#endif

};



/*

 * The CO-ebsa285 mapping.

 */

static struct map_desc co285_io_desc[] __initdata = {

#ifdef CONFIG_ARCH_CO285

	{

		.virtual	= PCIO_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IO),

		.length		= PCIO_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= PCIMEM_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_MEM),

		.length		= PCIMEM_SIZE,

		.type		= MT_DEVICE,

	},

#endif

};



void __init footbridge_map_io(void)

{

	/*
@@ -208,8 +189,6 @@ void __init footbridge_map_io(void) 
	 * Now, work out what we've got to map in addition on this

	 * platform.

	 */

	if (machine_is_co285())

		iotable_init(co285_io_desc, ARRAY_SIZE(co285_io_desc));

	if (footbridge_cfn_mode())

		iotable_init(ebsa285_host_io_desc, ARRAY_SIZE(ebsa285_host_io_desc));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE