Remove REDWOOD_[456] config options and conditional code
in [Kernel]
|
Prev: alpha: srmcons: localize spin_lock section
Next: union-mount: Introduce union_dir structure and basic operations
From: David Miller on 16 Jul 2010 16:50 From: Josh Boyer <jwboyer(a)linux.vnet.ibm.com> Date: Fri, 16 Jul 2010 10:20:55 -0400 > On Fri, Jul 16, 2010 at 02:29:02PM +0200, Christian Dietrich wrote: >>The config options for REDWOOD_[456] were commented out in the powerpc >>Kconfig. The ifdefs referencing this options therefore are dead and all >>references to this can be removed (Also dependencies in other KConfig >>files). >> >>Signed-off-by: Christian Dietrich <qy03fugy(a)stud.informatik.uni-erlangen.de> >>Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de> > > This seems fine with me. > > The only question is which tree it coms through. I'm happy to take it > in via mine if the netdev and MTD people are fine with that. Otherwise, > my ack is below. > > Acked-by: Josh Boyer <jwboyer(a)linux.vnet.ibm.com> Please take it: Acked-by: David S. Miller <davem(a)davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Artem Bityutskiy on 18 Jul 2010 13:00 On Fri, 2010-07-16 at 10:20 -0400, Josh Boyer wrote: > On Fri, Jul 16, 2010 at 02:29:02PM +0200, Christian Dietrich wrote: > >The config options for REDWOOD_[456] were commented out in the powerpc > >Kconfig. The ifdefs referencing this options therefore are dead and all > >references to this can be removed (Also dependencies in other KConfig > >files). > > > >Signed-off-by: Christian Dietrich <qy03fugy(a)stud.informatik.uni-erlangen.de> > >Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de> > > This seems fine with me. > > The only question is which tree it coms through. I'm happy to take it > in via mine if the netdev and MTD people are fine with that. Otherwise, > my ack is below. > > Acked-by: Josh Boyer <jwboyer(a)linux.vnet.ibm.com> You know how slow MTD people may be sometimes, so I'd suggest you to merge this via whatever tree. David is in CC, he'll complain if he is unhappy, I think. -- Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Benjamin Herrenschmidt on 18 Jul 2010 20:10
On Fri, 2010-07-16 at 14:29 +0200, Christian Dietrich wrote: > The config options for REDWOOD_[456] were commented out in the powerpc > Kconfig. The ifdefs referencing this options therefore are dead and all > references to this can be removed (Also dependencies in other KConfig > files). > > Signed-off-by: Christian Dietrich <qy03fugy(a)stud.informatik.uni-erlangen.de> > Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de> Acked-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> > --- > arch/powerpc/platforms/40x/Kconfig | 16 ------------- > drivers/mtd/maps/Kconfig | 2 +- > drivers/mtd/maps/redwood.c | 43 ------------------------------------ > drivers/net/Kconfig | 2 +- > drivers/net/smc91x.h | 37 ------------------------------- > 5 files changed, 2 insertions(+), 98 deletions(-) > > diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig > index ec64264..b721764 100644 > --- a/arch/powerpc/platforms/40x/Kconfig > +++ b/arch/powerpc/platforms/40x/Kconfig > @@ -71,22 +71,6 @@ config MAKALU > help > This option enables support for the AMCC PPC405EX board. > > -#config REDWOOD_5 > -# bool "Redwood-5" > -# depends on 40x > -# default n > -# select STB03xxx > -# help > -# This option enables support for the IBM STB04 evaluation board. > - > -#config REDWOOD_6 > -# bool "Redwood-6" > -# depends on 40x > -# default n > -# select STB03xxx > -# help > -# This option enables support for the IBM STBx25xx evaluation board. > - > #config SYCAMORE > # bool "Sycamore" > # depends on 40x > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > index f22bc9f..6629d09 100644 > --- a/drivers/mtd/maps/Kconfig > +++ b/drivers/mtd/maps/Kconfig > @@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM > > config MTD_REDWOOD > tristate "CFI Flash devices mapped on IBM Redwood" > - depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) > + depends on MTD_CFI > help > This enables access routines for the flash chips on the IBM > Redwood board. If you have one of these boards and would like to > diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c > index 933c0b6..d2c9db0 100644 > --- a/drivers/mtd/maps/redwood.c > +++ b/drivers/mtd/maps/redwood.c > @@ -22,8 +22,6 @@ > > #include <asm/io.h> > > -#if !defined (CONFIG_REDWOOD_6) > - > #define WINDOW_ADDR 0xffc00000 > #define WINDOW_SIZE 0x00400000 > > @@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { > } > }; > > -#else /* CONFIG_REDWOOD_6 */ > -/* FIXME: the window is bigger - armin */ > -#define WINDOW_ADDR 0xff800000 > -#define WINDOW_SIZE 0x00800000 > - > -#define RW_PART0_OF 0 > -#define RW_PART0_SZ 0x400000 /* 4 MiB data */ > -#define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ > -#define RW_PART1_SZ 0x10000 /* 64K VPD */ > -#define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ > -#define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) > -#define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ > -#define RW_PART3_SZ 0x20000 > - > -static struct mtd_partition redwood_flash_partitions[] = { > - { > - .name = "Redwood filesystem", > - .offset = RW_PART0_OF, > - .size = RW_PART0_SZ > - }, > - { > - .name = "Redwood OpenBIOS Vital Product Data", > - .offset = RW_PART1_OF, > - .size = RW_PART1_SZ, > - .mask_flags = MTD_WRITEABLE /* force read-only */ > - }, > - { > - .name = "Redwood kernel", > - .offset = RW_PART2_OF, > - .size = RW_PART2_SZ > - }, > - { > - .name = "Redwood OpenBIOS", > - .offset = RW_PART3_OF, > - .size = RW_PART3_SZ, > - .mask_flags = MTD_WRITEABLE /* force read-only */ > - } > -}; > - > -#endif /* CONFIG_REDWOOD_6 */ > - > struct map_info redwood_flash_map = { > .name = "IBM Redwood", > .size = WINDOW_SIZE, > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index ce2fcdd..313d306 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -913,7 +913,7 @@ config SMC91X > tristate "SMC 91C9x/91C1xxx support" > select CRC32 > select MII > - depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ > + depends on ARM || M32R || SUPERH || \ > MIPS || BLACKFIN || MN10300 || COLDFIRE > help > This is a driver for SMC's 91x series of Ethernet chipsets, > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h > index 8d2772c..ee74791 100644 > --- a/drivers/net/smc91x.h > +++ b/drivers/net/smc91x.h > @@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) > } > } > > -#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) > - > -/* We can only do 16-bit reads and writes in the static memory space. */ > -#define SMC_CAN_USE_8BIT 0 > -#define SMC_CAN_USE_16BIT 1 > -#define SMC_CAN_USE_32BIT 0 > -#define SMC_NOWAIT 1 > - > -#define SMC_IO_SHIFT 0 > - > -#define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) > -#define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) > -#define SMC_insw(a, r, p, l) \ > - do { \ > - unsigned long __port = (a) + (r); \ > - u16 *__p = (u16 *)(p); \ > - int __l = (l); \ > - insw(__port, __p, __l); \ > - while (__l > 0) { \ > - *__p = swab16(*__p); \ > - __p++; \ > - __l--; \ > - } \ > - } while (0) > -#define SMC_outsw(a, r, p, l) \ > - do { \ > - unsigned long __port = (a) + (r); \ > - u16 *__p = (u16 *)(p); \ > - int __l = (l); \ > - while (__l > 0) { \ > - /* Believe it or not, the swab isn't needed. */ \ > - outw( /* swab16 */ (*__p++), __port); \ > - __l--; \ > - } \ > - } while (0) > -#define SMC_IRQ_FLAGS (0) > - > #elif defined(CONFIG_SA1100_PLEB) > /* We can only do 16-bit reads and writes in the static memory space. */ > #define SMC_CAN_USE_8BIT 1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |