From e6e8c65ab17e2c37bef7b47608a9cdff2d49b370 Mon Sep 17 00:00:00 2001 From: kaloz Date: Mon, 17 Nov 2008 17:28:12 +0000 Subject: move some options to the generic 2.6.27 config git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13264 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/config-2.6.27 | 3 --- target/linux/atheros/config-2.6.27 | 3 --- target/linux/au1000/config-2.6.27 | 4 ---- target/linux/brcm63xx/config-2.6.27 | 3 --- target/linux/generic-2.6/config-2.6.27 | 9 +++++++++ target/linux/ixp4xx/config-2.6.27 | 4 ---- target/linux/olpc/config-2.6.27 | 5 ----- target/linux/ps3/config-2.6.27 | 6 ------ target/linux/rb532/config-2.6.27 | 4 ---- 9 files changed, 9 insertions(+), 32 deletions(-) diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27 index 2d7d57986..7b7d36ea0 100644 --- a/target/linux/ar71xx/config-2.6.27 +++ b/target/linux/ar71xx/config-2.6.27 @@ -58,8 +58,6 @@ CONFIG_DEVPORT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIXED_PHY is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -249,7 +247,6 @@ CONFIG_USB_SUPPORT=y CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_YAFFS_9BYTE_TAGS=y CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y CONFIG_YAFFS_AUTO_YAFFS2=y diff --git a/target/linux/atheros/config-2.6.27 b/target/linux/atheros/config-2.6.27 index 8c7933000..e93ea77ba 100644 --- a/target/linux/atheros/config-2.6.27 +++ b/target/linux/atheros/config-2.6.27 @@ -56,8 +56,6 @@ CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIXED_PHY is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -230,5 +228,4 @@ CONFIG_USB_WDM=m CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/au1000/config-2.6.27 b/target/linux/au1000/config-2.6.27 index 5ac35a429..941ecb018 100644 --- a/target/linux/au1000/config-2.6.27 +++ b/target/linux/au1000/config-2.6.27 @@ -56,8 +56,6 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_DUMMY=m CONFIG_ELF_CORE=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FIXED_PHY is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -153,7 +151,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_SIM is not set # CONFIG_MIPS_XXS1500 is not set -# CONFIG_MISDN is not set CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set @@ -271,6 +268,5 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_WDT_MTX1=y CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27 index 4095c5c92..2303047fb 100644 --- a/target/linux/brcm63xx/config-2.6.27 +++ b/target/linux/brcm63xx/config-2.6.27 @@ -84,8 +84,6 @@ CONFIG_EQUALIZER=m # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set CONFIG_EXT3_FS_XATTR=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIXED_PHY is not set CONFIG_FS_MBCACHE=m CONFIG_FS_POSIX_ACL=y @@ -314,7 +312,6 @@ CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN_ROUTER=m # CONFIG_WATCHDOG is not set diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27 index df3fe1339..5a62a2fe3 100644 --- a/target/linux/generic-2.6/config-2.6.27 +++ b/target/linux/generic-2.6/config-2.6.27 @@ -368,6 +368,8 @@ CONFIG_EXT2_FS=m CONFIG_EXT3_FS=m # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_EXTRA_FIRMWARE="" +CONFIG_EXTRA_TARGETS="" # CONFIG_FAIR_GROUP_SCHED is not set CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" @@ -378,6 +380,7 @@ CONFIG_FAT_FS=m # CONFIG_FEALNX is not set CONFIG_FIB_RULES=y # CONFIG_FIREWIRE is not set +# CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_FLATMEM=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLAT_NODE_MEM_MAP=y @@ -385,6 +388,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_FRAME_WARN=1024 # CONFIG_FS_POSIX_ACL is not set # CONFIG_FTL is not set +# CONFIG_FTRACE is not set # CONFIG_FUSE_FS is not set # CONFIG_FUSION is not set # CONFIG_FUSION_FC is not set @@ -405,6 +409,7 @@ CONFIG_GPIO_DEVICE=m # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_SYSFS is not set +# CONFIG_GPIOLIB is not set # CONFIG_GROUP_SCHED is not set # CONFIG_HAMACHI is not set CONFIG_HAMRADIO=y @@ -808,11 +813,13 @@ CONFIG_MAC_PARTITION=y # CONFIG_MEMSTICK is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_MFD_SM501 is not set +# CONFIG_MIGRATION is not set CONFIG_MII=y CONFIG_MINIX_FS=m # CONFIG_MINIX_SUBPARTITION is not set CONFIG_MINI_FO=y CONFIG_MISC_DEVICES=y +# CONFIG_MISDN is not set CONFIG_MKISS=m # CONFIG_MMC is not set # CONFIG_MMC_ARMMMCI is not set @@ -1933,10 +1940,12 @@ CONFIG_VIDEO_V4L1_COMPAT=y # CONFIG_VIDEO_WM8739 is not set # CONFIG_VIDEO_WM8775 is not set # CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIRQ_DEBUG is not set # CONFIG_VIRTUALIZATION is not set CONFIG_VIRT_TO_BUS=y # CONFIG_VITESSE_PHY is not set CONFIG_VLAN_8021Q=y +# CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VT is not set # CONFIG_VXFS_FS is not set diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27 index 4649f91aa..bc6fe42c2 100644 --- a/target/linux/ixp4xx/config-2.6.27 +++ b/target/linux/ixp4xx/config-2.6.27 @@ -95,13 +95,10 @@ CONFIG_DEVPORT=y CONFIG_DMABOUNCE=y CONFIG_DMABOUNCE_DEBUG=y CONFIG_DNOTIFY=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FPE_FASTFPE is not set # CONFIG_FPE_NWFPE is not set CONFIG_FRAME_POINTER=y CONFIG_FS_POSIX_ACL=y -# CONFIG_FTRACE is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_GENERIC_FIND_FIRST_BIT is not set @@ -346,7 +343,6 @@ CONFIG_VIA_VELOCITY=m CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_XSCALE_PMU=y CONFIG_ZBOOT_ROM_BSS=0x0 diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27 index a40cf3656..31c2be535 100644 --- a/target/linux/olpc/config-2.6.27 +++ b/target/linux/olpc/config-2.6.27 @@ -170,7 +170,6 @@ CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y CONFIG_EXT2_FS=y # CONFIG_EXT3_FS is not set -CONFIG_EXTRA_FIRMWARE="" CONFIG_FAST_CMPXCHG_LOCAL=y # CONFIG_FAULT_INJECTION is not set CONFIG_FB=y @@ -229,7 +228,6 @@ CONFIG_FB_GEODE_LX=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set # CONFIG_FIRMWARE_EDID is not set -CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FIRMWARE_MEMMAP is not set CONFIG_FIX_EARLYCON_MEM=y # CONFIG_FONTS is not set @@ -239,7 +237,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAME_POINTER is not set -# CONFIG_FTRACE is not set CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -254,7 +251,6 @@ CONFIG_GENERIC_ISA_DMA=y # CONFIG_GENERIC_LOCKBREAK is not set # CONFIG_GENERIC_TIME_VSYSCALL is not set CONFIG_GEODE_MFGPT_TIMER=y -# CONFIG_GPIOLIB is not set # CONFIG_HAMRADIO is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y @@ -665,7 +661,6 @@ CONFIG_VIDEO_SELECT=y CONFIG_VIDEO_V4L1=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_VM86=y # CONFIG_VMSPLIT_1G is not set # CONFIG_VMSPLIT_2G is not set diff --git a/target/linux/ps3/config-2.6.27 b/target/linux/ps3/config-2.6.27 index 8c93ecc77..b13d5f9f0 100644 --- a/target/linux/ps3/config-2.6.27 +++ b/target/linux/ps3/config-2.6.27 @@ -141,8 +141,6 @@ CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set CONFIG_EXT3_FS_XATTR=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_EXTRA_TARGETS="" # CONFIG_FAULT_INJECTION is not set CONFIG_FB=y # CONFIG_FB_BACKLIGHT is not set @@ -168,7 +166,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FIRMWARE_EDID is not set -# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FLATMEM_MANUAL is not set # CONFIG_FONTS is not set CONFIG_FONT_8x16=y @@ -180,7 +177,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAME_WARN=2048 # CONFIG_FSL_ULI1575 is not set CONFIG_FS_MBCACHE=y -# CONFIG_FTRACE is not set # CONFIG_FTR_FIXUP_SELFTEST is not set CONFIG_GELIC_NET=y CONFIG_GELIC_WIRELESS=y @@ -195,7 +191,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_ISA_DMA=y # CONFIG_GENERIC_TBSYNC is not set CONFIG_GENERIC_TIME_VSYSCALL=y -# CONFIG_GPIOLIB is not set # CONFIG_HAMRADIO is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y @@ -592,7 +587,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y # CONFIG_VGA_CONSOLE is not set # CONFIG_VIDEO_DEV is not set CONFIG_VIDEO_OUTPUT_CONTROL=y -# CONFIG_VIRQ_DEBUG is not set CONFIG_VIRT_CPU_ACCOUNTING=y # CONFIG_VLAN_8021Q is not set CONFIG_VM_EVENT_COUNTERS=y diff --git a/target/linux/rb532/config-2.6.27 b/target/linux/rb532/config-2.6.27 index 3947a18bb..757d1edfb 100644 --- a/target/linux/rb532/config-2.6.27 +++ b/target/linux/rb532/config-2.6.27 @@ -58,8 +58,6 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_EXT2_FS=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -119,7 +117,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set # CONFIG_MIPS_MT_SMTC is not set # CONFIG_MIPS_SIM is not set -# CONFIG_MISDN is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set CONFIG_MTD_BLKDEVS=y @@ -236,5 +233,4 @@ CONFIG_VIA_RHINE=y CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_VLAN_8021Q_GVRP is not set CONFIG_ZONE_DMA_FLAG=0 -- cgit v1.2.3