From 20df2bf82545c258c0eac87ade5778143b750864 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 25 Jan 2010 14:24:48 +0000 Subject: ar71xx: merge generic machine code into setup.c SVN-Revision: 19325 --- target/linux/ar71xx/config-2.6.30 | 5 ++--- target/linux/ar71xx/config-2.6.31 | 1 - target/linux/ar71xx/config-2.6.32 | 1 - target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig | 4 ---- .../linux/ar71xx/files/arch/mips/ar71xx/Makefile | 1 - .../ar71xx/files/arch/mips/ar71xx/mach-generic.c | 23 ---------------------- target/linux/ar71xx/files/arch/mips/ar71xx/setup.c | 8 ++++++++ 7 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30 index 878b6cd..89146ec 100644 --- a/target/linux/ar71xx/config-2.6.30 +++ b/target/linux/ar71xx/config-2.6.30 @@ -19,7 +19,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_DIR_600_A1=y CONFIG_AR71XX_MACH_DIR_615_C1=y CONFIG_AR71XX_MACH_DIR_825_B1=y -CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_MZK_W04NU=y CONFIG_AR71XX_MACH_MZK_W300NH=y CONFIG_AR71XX_MACH_PB42=y @@ -184,9 +183,9 @@ CONFIG_PHYLIB=y # CONFIG_PNX8550_STB810 is not set # CONFIG_PROBE_INITRD_HEADER is not set CONFIG_RTL8306_PHY=y -CONFIG_RTL8366_SMI=y CONFIG_RTL8366S_PHY=y -# CONFIG_RTL8366S_PHY_DEBUG_FS is not set +CONFIG_RTL8366S_PHY_DEBUG_FS=y +CONFIG_RTL8366_SMI=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCSI_DMA is not set # CONFIG_SERIAL_8250_EXTENDED is not set diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31 index 95bbc55..9cdfa01 100644 --- a/target/linux/ar71xx/config-2.6.31 +++ b/target/linux/ar71xx/config-2.6.31 @@ -21,7 +21,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_DIR_600_A1=y CONFIG_AR71XX_MACH_DIR_615_C1=y CONFIG_AR71XX_MACH_DIR_825_B1=y -CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_MZK_W04NU=y CONFIG_AR71XX_MACH_MZK_W300NH=y CONFIG_AR71XX_MACH_PB42=y diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32 index 2d83f96..002e4a9 100644 --- a/target/linux/ar71xx/config-2.6.32 +++ b/target/linux/ar71xx/config-2.6.32 @@ -21,7 +21,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_DIR_600_A1=y CONFIG_AR71XX_MACH_DIR_615_C1=y CONFIG_AR71XX_MACH_DIR_825_B1=y -CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_MZK_W04NU=y CONFIG_AR71XX_MACH_MZK_W300NH=y CONFIG_AR71XX_MACH_PB42=y diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig index 29c5590..50ae98f 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig @@ -76,10 +76,6 @@ config AR71XX_MACH_WZR_HP_G300NH select AR71XX_DEV_USB default y -config AR71XX_MACH_GENERIC - bool "Generic AR71xx based machine support" - default y - config AR71XX_MACH_WP543 bool "Compex WP543/WPJ543 board support" select MYLOADER diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile index bf13b8d..13b5c41 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile @@ -31,7 +31,6 @@ obj-$(CONFIG_AR71XX_MACH_AW_NR580) += mach-aw-nr580.o obj-$(CONFIG_AR71XX_MACH_DIR_600_A1) += mach-dir-600-a1.o obj-$(CONFIG_AR71XX_MACH_DIR_615_C1) += mach-dir-615-c1.o obj-$(CONFIG_AR71XX_MACH_DIR_825_B1) += mach-dir-825-b1.o -obj-$(CONFIG_AR71XX_MACH_GENERIC) += mach-generic.o obj-$(CONFIG_AR71XX_MACH_MZK_W04NU) += mach-mzk-w04nu.o obj-$(CONFIG_AR71XX_MACH_MZK_W300NH) += mach-mzk-w300nh.o obj-$(CONFIG_AR71XX_MACH_PB42) += mach-pb42.o diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c deleted file mode 100644 index 8dfa640..0000000 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Generic AR71xx machine support - * - * Copyright (C) 2008 Gabor Juhos - * Copyright (C) 2008 Imre Kaloz - * - * 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. - */ - -#include - -#include -#include "machtype.h" - -static void __init ar71xx_generic_init(void) -{ - /* Nothing to do */ -} - -MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic", "Generic AR71xx board", - ar71xx_generic_init); diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c index f235922..1d9feda 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c @@ -288,3 +288,11 @@ static int __init ar71xx_machine_setup(void) } arch_initcall(ar71xx_machine_setup); + +static void __init ar71xx_generic_init(void) +{ + /* Nothing to do */ +} + +MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic", "Generic AR71xx board", + ar71xx_generic_init); -- cgit v1.1