From d74ea347fe3efece372a911cfc4394d0713e38a5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 23 Sep 2006 22:03:23 +0000 Subject: [PATCH] clean up filesystem selction SVN-Revision: 4847 --- openwrt/Config.in | 11 ++++------- openwrt/target/Config.in | 21 ++++++++++++++++++++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/openwrt/Config.in b/openwrt/Config.in index d1d66ff0db..7b28255fb5 100644 --- a/openwrt/Config.in +++ b/openwrt/Config.in @@ -64,31 +64,28 @@ menu "Target Images" config TARGET_ROOTFS_JFFS2 bool "jffs2" - default y + default y if USES_JFFS2 depends !TARGET_ROOTFS_INITRAMFS help Build a jffs2 root filesystem config TARGET_ROOTFS_SQUASHFS bool "squashfs" - default y - depends !LINUX_2_6_ARUBA - depends !LINUX_2_6_XSCALE + default y if USES_SQUASHFS depends !TARGET_ROOTFS_INITRAMFS - depends !LINUX_2_6_AU1000 help Build a squashfs-lzma root filesystem config TARGET_ROOTFS_TGZ bool "tgz" - default y if !LINUX_2_4_BRCM && !LINUX_2_6_BRCM && !LINUX_2_6_ARUBA && !LINUX_2_4_AR531X + default y if !USES_SQUASHFS && !USES_JFFS2 depends !TARGET_ROOTFS_INITRAMFS help Build a compressed tar archive of the the root filesystem config TARGET_ROOTFS_EXT2FS bool "ext2" - default y if LINUX_2_6_UML + default y if !USES_SQUASHFS && !USES_JFFS2 depends !TARGET_ROOTFS_INITRAMFS help Ext2 file system with some free space for uml images diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in index 6b317dd881..e7048cd59a 100644 --- a/openwrt/target/Config.in +++ b/openwrt/target/Config.in @@ -8,6 +8,7 @@ config LINUX_2_6_AU1000 select LINUX_2_6 select PCI_SUPPORT select USB_SUPPORT + select USES_JFFS2 help Build firmware for AMD Alchemy 1500 boards (e.g. 4G-Systems Mesh/Access Cube ...) @@ -19,6 +20,7 @@ config LINUX_2_6_ARUBA select PCI_SUPPORT select USB_SUPPORT select BIG_ENDIAN + select USES_JFFS2 help Build firmware images for Aruba boards @@ -28,6 +30,7 @@ config LINUX_2_4_AR531X select mips select LINUX_2_4 select BIG_ENDIAN + select USES_JFFS2 help Build firmware images for Atheros AR531x based boards (e.g. Netgear WGT624, Linksys WRT55AG) @@ -38,6 +41,8 @@ config LINUX_2_4_BRCM select PCI_SUPPORT select USB_SUPPORT select PCMCIA_SUPPORT + select USES_SQUASHFS + select USES_JFFS2 help Build firmware images for Broadcom based routers (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G) @@ -53,6 +58,8 @@ config LINUX_2_6_BRCM select PCI_SUPPORT select USB_SUPPORT #select PCMCIA_SUPPORT + select USES_SQUASHFS + select USES_JFFS2 help Build firmware images for Broadcom based routers (e.g. Netgear WGT634u) @@ -65,6 +72,8 @@ config LINUX_2_6_BRCM63XX select PCI_SUPPORT select USB_SUPPORT select PCMCIA_SUPPORT + select USES_SQUASHFS + select USES_JFFS2 help Build firmware images for Broadcom based xDSL/routers (e.g. Inventel Livebox, Siemens SE515) @@ -76,6 +85,7 @@ config LINUX_2_6_XSCALE select BIG_ENDIAN select PCI_SUPPORT select USB_SUPPORT + select USES_JFFS2 config LINUX_2_6_MAGICBOX bool "Magicbox [2.6]" @@ -83,16 +93,20 @@ config LINUX_2_6_MAGICBOX select LINUX_2_6 select BIG_ENDIAN select PCI_SUPPORT + select USES_JFFS2 config LINUX_2_6_RB532 bool "Mikrotik RB532 [2.6]" select mipsel select LINUX_2_6 select PCI_SUPPORT + select USES_JFFS2 config LINUX_2_4_AR7 bool "TI AR7 [2.4]" select mipsel + select USES_SQUASHFS + select USES_JFFS2 help Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2) @@ -203,6 +217,12 @@ config USB_SUPPORT config BIG_ENDIAN bool +config USES_SQUASHFS + bool + +config USES_JFFS2 + bool + # Architecture selection config i386 @@ -260,4 +280,3 @@ config ARCH default "sh4eb" if sh4eb default "sparc" if sparc -