From a26bbdb7a5f8ac7a9e377870ddf9afaec5907400 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Jan 2006 20:45:12 +0000 Subject: [PATCH] Move device selection first in menuconfig (#18) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2880 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/Config.in | 3 +- openwrt/target/Config.in | 78 +++++++++++++++++++++++--------- openwrt/target/linux/Config.in | 82 +++++++++------------------------- 3 files changed, 80 insertions(+), 83 deletions(-) diff --git a/openwrt/Config.in b/openwrt/Config.in index 5a1768b8d..94b74581b 100644 --- a/openwrt/Config.in +++ b/openwrt/Config.in @@ -95,6 +95,7 @@ config BR2_JLEVEL int default "1" +source "target/Config.in" source "toolchain/Config.in" source "package/Config.in" -source "target/Config.in" +source "target/linux/Config.in" diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in index 835335919..e51b1cfc7 100644 --- a/openwrt/target/Config.in +++ b/openwrt/target/Config.in @@ -1,27 +1,65 @@ -menu "Target Root Filesystem" +choice + prompt "Target System" + +config BR2_LINUX_2_4_AR531X + bool "Atheros AR531x [2.4]" + default n + depends BR2_mips + help + Build firmware images for Atheros AR531x based boards + (e.g. Netgear WGT624, Linksys WRT55AG) - config BR2_TARGET_ROOTFS_JFFS2 - bool "jffs2" - default y - help - Build a jffs2 root filesystem +config BR2_LINUX_2_4_BRCM + bool "Broadcom BCM47xx/53xx [2.4]" + default y + depends BR2_mipsel + select BR2_LINUX_PCMCIA_SUPPORT + help + Build firmware images for Broadcom based routers + (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G) + + This one builds the generic .trx images, activate one of the + options below for creating device specific files for use + with TFTP client too. - config BR2_TARGET_ROOTFS_SQUASHFS_LZMA - bool "squashfs-lzma" - default y - help - Build a squashfs-lzma root filesystem +config BR2_LINUX_2_6_BRCM + bool "Broadcom BCM47xx/53xx [2.6]" + default n + depends BR2_mipsel + select BR2_LINUX_PCMCIA_SUPPORT + help + Build firmware images for Broadcom based routers + (e.g. Netgear WGT634u) - config BR2_TARGET_ROOTFS_TGZ - bool "tgz" - default y - help - Build a compressed tar archive of the the root filesystem +config BR2_LINUX_2_4_AR7 + bool "TI AR7 [2.4]" + default n + depends BR2_mipsel + help + Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2) -endmenu +config BR2_LINUX_2_4_X86 + bool "x86 [2.4]" + default n + depends BR2_i386 + select BR2_LINUX_PCMCIA_SUPPORT + help + Build firmware images for x86 based boards + (e.g. Soekris net4521 and net4801, PC Engines WRAP...) -menu "Kernel Configuration / Device Support" +config BR2_LINUX_2_6_X86 + bool "x86 [2.6]" + default n + depends BR2_i386 + select BR2_LINUX_PCMCIA_SUPPORT + help + Build firmware images for x86 based boards + (e.g. Soekris net4521 and net4801, PC Engines WRAP...) -source "target/linux/Config.in" +endchoice + +config BR2_LINUX_PCMCIA_SUPPORT + bool + default n + depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM -endmenu diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in index 5a6c11a0f..2dd2aba1d 100644 --- a/openwrt/target/linux/Config.in +++ b/openwrt/target/linux/Config.in @@ -1,75 +1,31 @@ -choice - prompt "Target system" - -config BR2_LINUX_2_4_BRCM - bool "Support for Broadcom based routers [2.4]" - default y - depends BR2_mipsel - select BR2_LINUX_PCMCIA_SUPPORT - help - Build firmware images for Broadcom based routers - (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G) - - This one builds the generic .trx images, activate one of the - options below for creating device specific files for use - with TFTP client too. +menu "Target Root Filesystem" -config BR2_LINUX_2_4_AR7 - bool "Support for TI AR7 based devices [2.4]" - default n - depends BR2_mipsel - help - Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2) + config BR2_TARGET_ROOTFS_JFFS2 + bool "jffs2" + default y + help + Build a jffs2 root filesystem -config BR2_LINUX_2_4_X86 - bool "Support for x86 boards [2.4]" - default n - depends BR2_i386 - select BR2_LINUX_PCMCIA_SUPPORT - help - Build firmware images for x86 based boards - (e.g. Soekris net4521 and net4801, PC Engines WRAP...) + config BR2_TARGET_ROOTFS_SQUASHFS_LZMA + bool "squashfs-lzma" + default y + help + Build a squashfs-lzma root filesystem -config BR2_LINUX_2_6_BRCM - bool "Support for Broadcom based routers [2.6]" - default n - depends BR2_mipsel - select BR2_LINUX_PCMCIA_SUPPORT - help - Build firmware images for Broadcom based routers - (e.g. Netgear WGT634u) + config BR2_TARGET_ROOTFS_TGZ + bool "tgz" + default y + help + Build a compressed tar archive of the the root filesystem -config BR2_LINUX_2_6_X86 - bool "Support for x86 boards [2.6]" - default n - depends BR2_i386 - select BR2_LINUX_PCMCIA_SUPPORT - help - Build firmware images for x86 based boards - (e.g. Soekris net4521 and net4801, PC Engines WRAP...) - -config BR2_LINUX_2_4_AR531X - bool "Support for Atheros ar531x based APs" - default n - depends BR2_mips - help - Build firmware images for Atheros ar531x based boards - (e.g. Netgear WGT624, Linksys WRT55AG) - -endchoice - - -config BR2_LINUX_PCMCIA_SUPPORT - bool - default n - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM +endmenu +menu "Kernel Configuration / Device Support" comment "Device specific modules" source "target/linux/*-2.[46]/Config.in" - comment "Networking modules" config BR2_PACKAGE_KMOD_ATM @@ -773,3 +729,5 @@ config BR2_PACKAGE_KMOD_WD1100 comment "Additional kernel modules" source "target/linux/package/Config.in" + +endmenu -- 2.20.1