KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: merge generic machine code into setup.c

Browse source 
SVN-Revision: 19325
This commit is contained in:
Gabor Juhos 2010-01-25 14:24:48 +00:00
parent cae33bf4e9
commit 20df2bf825
7 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/linux/ar71xx/config-2.6.30
View file

@ -19,7 +19,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_DIR_600_A1=y CONFIG_AR71XX_MACH_DIR_600_A1=y
CONFIG_AR71XX_MACH_DIR_615_C1=y CONFIG_AR71XX_MACH_DIR_615_C1=y
CONFIG_AR71XX_MACH_DIR_825_B1=y CONFIG_AR71XX_MACH_DIR_825_B1=y
CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_MZK_W04NU=y CONFIG_AR71XX_MACH_MZK_W04NU=y
CONFIG_AR71XX_MACH_MZK_W300NH=y CONFIG_AR71XX_MACH_MZK_W300NH=y
CONFIG_AR71XX_MACH_PB42=y CONFIG_AR71XX_MACH_PB42=y
@ -184,9 +183,9 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_STB810 is not set # CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set # CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y CONFIG_RTL8306_PHY=y
CONFIG_RTL8366_SMI=y
CONFIG_RTL8366S_PHY=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_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_EXTENDED is not set

1
target/linux/ar71xx/config-2.6.31
View file

@ -21,7 +21,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_DIR_600_A1=y CONFIG_AR71XX_MACH_DIR_600_A1=y
CONFIG_AR71XX_MACH_DIR_615_C1=y CONFIG_AR71XX_MACH_DIR_615_C1=y
CONFIG_AR71XX_MACH_DIR_825_B1=y CONFIG_AR71XX_MACH_DIR_825_B1=y
CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_MZK_W04NU=y CONFIG_AR71XX_MACH_MZK_W04NU=y
CONFIG_AR71XX_MACH_MZK_W300NH=y CONFIG_AR71XX_MACH_MZK_W300NH=y
CONFIG_AR71XX_MACH_PB42=y CONFIG_AR71XX_MACH_PB42=y

1
target/linux/ar71xx/config-2.6.32
View file

@ -21,7 +21,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_DIR_600_A1=y CONFIG_AR71XX_MACH_DIR_600_A1=y
CONFIG_AR71XX_MACH_DIR_615_C1=y CONFIG_AR71XX_MACH_DIR_615_C1=y
CONFIG_AR71XX_MACH_DIR_825_B1=y CONFIG_AR71XX_MACH_DIR_825_B1=y
CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_MZK_W04NU=y CONFIG_AR71XX_MACH_MZK_W04NU=y
CONFIG_AR71XX_MACH_MZK_W300NH=y CONFIG_AR71XX_MACH_MZK_W300NH=y
CONFIG_AR71XX_MACH_PB42=y CONFIG_AR71XX_MACH_PB42=y

4
target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
View file

@ -76,10 +76,6 @@ config AR71XX_MACH_WZR_HP_G300NH
select AR71XX_DEV_USB select AR71XX_DEV_USB
default y default y
config AR71XX_MACH_GENERIC
bool "Generic AR71xx based machine support"
default y
config AR71XX_MACH_WP543 config AR71XX_MACH_WP543
bool "Compex WP543/WPJ543 board support" bool "Compex WP543/WPJ543 board support"
select MYLOADER select MYLOADER

1
target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
View file

@ -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_600_A1) += mach-dir-600-a1.o
obj-$(CONFIG_AR71XX_MACH_DIR_615_C1) += mach-dir-615-c1.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_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_W04NU) += mach-mzk-w04nu.o
obj-$(CONFIG_AR71XX_MACH_MZK_W300NH) += mach-mzk-w300nh.o obj-$(CONFIG_AR71XX_MACH_MZK_W300NH) += mach-mzk-w300nh.o
obj-$(CONFIG_AR71XX_MACH_PB42) += mach-pb42.o obj-$(CONFIG_AR71XX_MACH_PB42) += mach-pb42.o

23
target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c
View file

@ -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);

8
target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
View file

@ -288,3 +288,11 @@ static int __init ar71xx_machine_setup(void)
} }
arch_initcall(ar71xx_machine_setup); 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);