move more stuff around for better board support

35 files changed, 61 insertions, 16 deletions

diff --git a/package/Config.in b/package/Config.in
index 8c16af0b55..f1e1f11a78 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -53,7 +53,6 @@ source "package/libpcap/Config.in"
 source "package/libpng/Config.in"
 source "package/libtool/Config.in"
 source "package/links/Config.in"
-source "package/linux/Config.in"
 source "package/lrzsz/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/ltrace/Config.in"
diff --git a/target/Config.in b/target/Config.in
index a78a047a09..7694a8e16b 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -6,5 +6,6 @@ source "target/jffs2/Config.in"
 source "target/squashfs/Config.in"
 source "target/tar/Config.in"
 source "target/device/Config.in"
+source "target/generic/Config.in"
 
 endmenu
diff --git a/target/device/Config.in b/target/device/Config.in
index aff4dfdc9d..7ad0e830b8 100644
--- a/target/device/Config.in
+++ b/target/device/Config.in
@@ -1,5 +1,5 @@
 menu "Board Support Options"
 
-source "target/device/generic/Soekris/Config.in"
+source "target/device/Soekris/Config.in"
 
 endmenu
diff --git a/target/device/Soekris/Config.in b/target/device/Soekris/Config.in
index a64fc2c790..1a7f8a83df 100644
--- a/target/device/Soekris/Config.in
+++ b/target/device/Soekris/Config.in
@@ -1,5 +1,6 @@
 config BR2_TARGET_SOEKRIS_NET4521
 	bool "Soekris net4521"
+	depends BR2_i386
 	default n
 	help
 	  The Soekris net4521
diff --git a/package/linux/Config.in b/target/device/Soekris/net4521/Config.in
index 4588e48efb..4588e48efb 100644
--- a/package/linux/Config.in
+++ b/target/device/Soekris/net4521/Config.in
diff --git a/package/linux/kernel-patches/003_kbuild_fixes.diff.bz2 b/target/device/Soekris/net4521/kernel-patches/003_kbuild_fixes.diff.bz2
index 4494739ab2..4494739ab2 100644
--- a/package/linux/kernel-patches/003_kbuild_fixes.diff.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/003_kbuild_fixes.diff.bz2
diff --git a/package/linux/kernel-patches/004_386_emu.diff.bz2 b/target/device/Soekris/net4521/kernel-patches/004_386_emu.diff.bz2
index 8e912e2794..8e912e2794 100644
--- a/package/linux/kernel-patches/004_386_emu.diff.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/004_386_emu.diff.bz2
diff --git a/package/linux/kernel-patches/005_modularize_vesafb.diff.bz2 b/target/device/Soekris/net4521/kernel-patches/005_modularize_vesafb.diff.bz2
index 8f187e37c6..8f187e37c6 100644
--- a/package/linux/kernel-patches/005_modularize_vesafb.diff.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/005_modularize_vesafb.diff.bz2
diff --git a/package/linux/kernel-patches/006_init_unshare.diff.bz2 b/target/device/Soekris/net4521/kernel-patches/006_init_unshare.diff.bz2
index d1dfc71696..d1dfc71696 100644
--- a/package/linux/kernel-patches/006_init_unshare.diff.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/006_init_unshare.diff.bz2
diff --git a/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 b/target/device/Soekris/net4521/kernel-patches/007-scsi_add_remove_single.bz2
index cf6138b126..cf6138b126 100644
--- a/package/linux/kernel-patches/007-scsi_add_remove_single.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/007-scsi_add_remove_single.bz2
diff --git a/package/linux/kernel-patches/008-ieee1394-fix.bz2 b/target/device/Soekris/net4521/kernel-patches/008-ieee1394-fix.bz2
index d88f251349..d88f251349 100644
--- a/package/linux/kernel-patches/008-ieee1394-fix.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/008-ieee1394-fix.bz2
diff --git a/package/linux/kernel-patches/009-always-inline.bz2 b/target/device/Soekris/net4521/kernel-patches/009-always-inline.bz2
index 0838fedd6d..0838fedd6d 100644
--- a/package/linux/kernel-patches/009-always-inline.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/009-always-inline.bz2
diff --git a/package/linux/kernel-patches/010-optimize-for-size.bz2 b/target/device/Soekris/net4521/kernel-patches/010-optimize-for-size.bz2
index ae5cbbe719..ae5cbbe719 100644
--- a/package/linux/kernel-patches/010-optimize-for-size.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/010-optimize-for-size.bz2
diff --git a/package/linux/kernel-patches/012-x86-check_gcc.bz2 b/target/device/Soekris/net4521/kernel-patches/012-x86-check_gcc.bz2
index f645dc1aa9..f645dc1aa9 100644
--- a/package/linux/kernel-patches/012-x86-check_gcc.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/012-x86-check_gcc.bz2
diff --git a/package/linux/kernel-patches/015_cramfs_initrd.diff.bz2 b/target/device/Soekris/net4521/kernel-patches/015_cramfs_initrd.diff.bz2
index 1cbbbd5d70..1cbbbd5d70 100644
--- a/package/linux/kernel-patches/015_cramfs_initrd.diff.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/015_cramfs_initrd.diff.bz2
diff --git a/package/linux/kernel-patches/017-printk.bz2 b/target/device/Soekris/net4521/kernel-patches/017-printk.bz2
index da99976164..da99976164 100644
--- a/package/linux/kernel-patches/017-printk.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/017-printk.bz2
diff --git a/package/linux/kernel-patches/018-slab-loop-init.bz2 b/target/device/Soekris/net4521/kernel-patches/018-slab-loop-init.bz2
index dfba2bae58..dfba2bae58 100644
--- a/package/linux/kernel-patches/018-slab-loop-init.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/018-slab-loop-init.bz2
diff --git a/package/linux/kernel-patches/041-changeloop.patch.bz2 b/target/device/Soekris/net4521/kernel-patches/041-changeloop.patch.bz2
index 9e64eca6b5..9e64eca6b5 100644
--- a/package/linux/kernel-patches/041-changeloop.patch.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/041-changeloop.patch.bz2
diff --git a/package/linux/kernel-patches/042-loopfixes.patch.bz2 b/target/device/Soekris/net4521/kernel-patches/042-loopfixes.patch.bz2
index 456ee6145a..456ee6145a 100644
--- a/package/linux/kernel-patches/042-loopfixes.patch.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/042-loopfixes.patch.bz2
diff --git a/package/linux/kernel-patches/044-streaming_io.bz2 b/target/device/Soekris/net4521/kernel-patches/044-streaming_io.bz2
index 4f453e1820..4f453e1820 100644
--- a/package/linux/kernel-patches/044-streaming_io.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/044-streaming_io.bz2
diff --git a/package/linux/kernel-patches/062-silence-blk-queue.bz2 b/target/device/Soekris/net4521/kernel-patches/062-silence-blk-queue.bz2
index b305f783bb..b305f783bb 100644
--- a/package/linux/kernel-patches/062-silence-blk-queue.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/062-silence-blk-queue.bz2
diff --git a/package/linux/kernel-patches/063-silence.kbd.patch.bz2 b/target/device/Soekris/net4521/kernel-patches/063-silence.kbd.patch.bz2
index 6dd7fbeda7..6dd7fbeda7 100644
--- a/package/linux/kernel-patches/063-silence.kbd.patch.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/063-silence.kbd.patch.bz2
diff --git a/package/linux/kernel-patches/064-shutup-md.bz2 b/target/device/Soekris/net4521/kernel-patches/064-shutup-md.bz2
index 944b12acef..944b12acef 100644
--- a/package/linux/kernel-patches/064-shutup-md.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/064-shutup-md.bz2
diff --git a/package/linux/kernel-patches/067-squashfs2.patch.bz2 b/target/device/Soekris/net4521/kernel-patches/067-squashfs2.patch.bz2
index fb8d59b577..fb8d59b577 100644
--- a/package/linux/kernel-patches/067-squashfs2.patch.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/067-squashfs2.patch.bz2
diff --git a/package/linux/kernel-patches/076-nmap-freak.bz2 b/target/device/Soekris/net4521/kernel-patches/076-nmap-freak.bz2
index 580b5a8207..580b5a8207 100644
--- a/package/linux/kernel-patches/076-nmap-freak.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/076-nmap-freak.bz2
diff --git a/package/linux/kernel-patches/077-orinoco-0.13e.bz2 b/target/device/Soekris/net4521/kernel-patches/077-orinoco-0.13e.bz2
index 7f2bfb3dc5..7f2bfb3dc5 100644
--- a/package/linux/kernel-patches/077-orinoco-0.13e.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/077-orinoco-0.13e.bz2
diff --git a/package/linux/kernel-patches/078-hostap.bz2 b/target/device/Soekris/net4521/kernel-patches/078-hostap.bz2
index 5d157b07ae..5d157b07ae 100644
--- a/package/linux/kernel-patches/078-hostap.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/078-hostap.bz2
diff --git a/package/linux/kernel-patches/079-jiffies64.bz2 b/target/device/Soekris/net4521/kernel-patches/079-jiffies64.bz2
index f3cea9e1ed..f3cea9e1ed 100644
--- a/package/linux/kernel-patches/079-jiffies64.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/079-jiffies64.bz2
diff --git a/package/linux/kernel-patches/089-no-touch-makedep.bz2 b/target/device/Soekris/net4521/kernel-patches/089-no-touch-makedep.bz2
index 2e413ccafc..2e413ccafc 100644
--- a/package/linux/kernel-patches/089-no-touch-makedep.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/089-no-touch-makedep.bz2
diff --git a/package/linux/kernel-patches/100_VERSION.bz2 b/target/device/Soekris/net4521/kernel-patches/100_VERSION.bz2
index 053f2c9b54..053f2c9b54 100644
--- a/package/linux/kernel-patches/100_VERSION.bz2
+++ b/target/device/Soekris/net4521/kernel-patches/100_VERSION.bz2
diff --git a/package/linux/linux.config b/target/device/Soekris/net4521/linux.config
index d7a02606eb..d7a02606eb 100644
--- a/package/linux/linux.config
+++ b/target/device/Soekris/net4521/linux.config
diff --git a/package/linux/linux.mk b/target/device/Soekris/net4521/linux.mk
index 2d29a6a3ec..2d29a6a3ec 100644
--- a/package/linux/linux.mk
+++ b/target/device/Soekris/net4521/linux.mk
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 29127691f4..6e9328fdb7 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -1,5 +1,61 @@
 comment "Generic Device Support"
 
-source "target/device/generic/access_point/Config.in"
-source "target/device/generic/firewall/Config.in"
+config BR2_TARGET_GENERIC_ACCESS_POINT
+	bool "Generic wireless access point"
+	default n
+	select BR2_PACKAGE_WIRELESS_TOOLS
+	select BR2_PACKAGE_DHCP_RELAY
+	select BR2_PACKAGE_BRIDGE
+	help
+	  Board support for a generic wireless access point.
+
+
+config BR2_TARGET_GENERIC_FIREWALL
+	bool "Generic firewall"
+	default n
+	select BR2_PACKAGE_IPTABLES
+	help
+	  Board support for a generic firewalling router.
+
+
+config BR2_TARGET_GENERIC_DEV_SYSTEM
+	bool "Generic firewall"
+	default n
+	select BR2_CCACHE
+	select BR2_PACKAGE_GDB
+	select BR2_PACKAGE_GDB_SERVER
+	select BR2_PACKAGE_BASH
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_COREUTILS
+	select BR2_PACKAGE_DIFFUTILS
+	select BR2_PACKAGE_ED
+	select BR2_PACKAGE_FINDUTILS
+	select BR2_PACKAGE_FLEX
+	select BR2_PACKAGE_GAWK
+	select BR2_PACKAGE_GCC_TARGET
+	select BR2_PACKAGE_CCACHE_TARGET
+	select BR2_PACKAGE_GREP
+	select BR2_PACKAGE_MAKE
+	select BR2_PACKAGE_PATCH
+	select BR2_PACKAGE_SED
+	select BR2_PACKAGE_TAR
+	select BR2_PACKAGE_AUTOCONF
+	select BR2_PACKAGE_AUTOMAKE
+	select BR2_PACKAGE_DROPBEAR_SSHD
+	select BR2_PACKAGE_FILE
+	select BR2_PACKAGE_GZIP
+	select BR2_PACKAGE_LESS
+	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_M4
+	select BR2_PACKAGE_MKE2FS
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NETKITBASE
+	select BR2_PACKAGE_PCIUTILS
+	select BR2_PACKAGE_PROCPS
+	select BR2_PACKAGE_RSYNC
+	select BR2_PACKAGE_STRACE
+	select BR2_PACKAGE_UTIL-LINUX
+	select BR2_PACKAGE_ZLIB
+	help
+	  Board support for a generic firewalling router.
 
diff --git a/target/generic/access_point/Config.in b/target/generic/access_point/Config.in
deleted file mode 100644
index b0166d2f6d..0000000000
--- a/target/generic/access_point/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_TARGET_GENERIC_ACCESS_POINT
-	bool "Generic wireless access point"
-	default n
-	help
-	  Board support for a generic wireless access point.
-
diff --git a/target/generic/firewall/Config.in b/target/generic/firewall/Config.in
deleted file mode 100644
index d20681b152..0000000000
--- a/target/generic/firewall/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_TARGET_GENERIC_ACCESS_POINT
-	bool "Generic firewall"
-	default n
-	help
-	  Board support for a generic firewalling router.
-