diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-25 14:24:48 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-25 14:24:48 +0000 |
| commit | 20df2bf82545c258c0eac87ade5778143b750864 (patch) | |
| tree | 87d6aee39c60d7aef530db98b7ea93e172346461 /target/linux/ar71xx/files/arch | |
| parent | cae33bf4e92744490432350ae00ec50da0cc4980 (diff) | |
| download | mtk-20170518-20df2bf82545c258c0eac87ade5778143b750864.zip mtk-20170518-20df2bf82545c258c0eac87ade5778143b750864.tar.gz mtk-20170518-20df2bf82545c258c0eac87ade5778143b750864.tar.bz2 | |
ar71xx: merge generic machine code into setup.c
SVN-Revision: 19325
Diffstat (limited to 'target/linux/ar71xx/files/arch')
4 files changed, 8 insertions, 28 deletions
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 <juhosg@openwrt.org> - * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org> - * - * 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 <linux/init.h> - -#include <asm/mach-ar71xx/ar71xx.h> -#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); |