move a few more 2.6.36 config options from ar71xx to generic

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23580 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/config-2.6.36 b/target/linux/ar71xx/config-2.6.36
index 2ca6a6d..b2c3cd7 100644 (file)
--- a/target/linux/ar71xx/config-2.6.36
+++ b/target/linux/ar71xx/config-2.6.36
@@ -1,10 +1,7 @@
-CONFIG_32BIT=y
 CONFIG_AG71XX=y
 CONFIG_AG71XX_AR8216_SUPPORT=y
 # CONFIG_AG71XX_DEBUG is not set
 # CONFIG_AG71XX_DEBUG_FS is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
 CONFIG_AR71XX_DEV_AP91_PCI=y
 CONFIG_AR71XX_DEV_AP94_PCI=y
 CONFIG_AR71XX_DEV_AR913X_WMAC=y
@@ -61,12 +58,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ATHEROS_AR71XX=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-CONFIG_CAVIUM_OCTEON_HELPER=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
@@ -85,8 +76,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_FSNOTIFY is not set
@@ -116,7 +105,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
-# CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
@@ -131,24 +119,12 @@ CONFIG_IRQ_CPU=y
 # CONFIG_LEDS_WNDR3700_USB is not set
 CONFIG_LOONGSON_UART_BASE=y
 # CONFIG_M25PXX_USE_FAST_READ is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_JZ4740 is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
 CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
-# CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
-# CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_SIM is not set
 CONFIG_MTD_AR91XX_FLASH=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
@@ -163,48 +139,19 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6063=y
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_TAG_DSA is not set
-# CONFIG_NET_DSA_TAG_EDSA is not set
 CONFIG_NET_DSA_TAG_TRAILER=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
 CONFIG_RTL8306_PHY=y
 CONFIG_RTL8366RB_PHY=y
 CONFIG_RTL8366S_PHY=y
 CONFIG_RTL8366_SMI=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
-CONFIG_SCSI_MOD=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SPI=y
@@ -214,10 +161,6 @@ CONFIG_SPI_BITBANG=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_PB44=y
-# CONFIG_SPI_RB4XX is not set
-# CONFIG_SPI_RB4XX_CPLD is not set
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_VSC7385 is not set
 CONFIG_SWCONFIG=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
@@ -225,7 +168,5 @@ CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
 CONFIG_ZONE_DMA_FLAG=0

diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index 0c0da5d..6073abc 100644 (file)
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -1,3 +1,4 @@
+CONFIG_32BIT=y
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
@@ -24,11 +25,13 @@
 CONFIG_AIO=y
 # CONFIG_AIRO is not set
 # CONFIG_AIRO_CS is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_AMIGA_PARTITION is not set
 CONFIG_ANON_INODES=y
 # CONFIG_APPLICOM is not set
+# CONFIG_AR7 is not set
 # CONFIG_AR8216_PHY is not set
 # CONFIG_AR9170_USB is not set
 # CONFIG_ARCH_AAEC2000 is not set
@@ -147,6 +150,8 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
 # CONFIG_BE2ISCSI is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
@@ -154,6 +159,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
+CONFIG_BITREVERSE=y
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
 CONFIG_BLK_DEV=y
@@ -299,6 +305,9 @@ CONFIG_CARDBUS=y
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 # CONFIG_CB710_CORE is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CDROM_PKTCDVD is not set
@@ -476,6 +485,7 @@ CONFIG_DEFAULT_WESTWOOD=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DEVTMPFS is not set
 # CONFIG_DEVTMPFS_MOUNT is not set
@@ -483,6 +493,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DL2K is not set
 # CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMASCC is not set
 # CONFIG_DMATEST is not set
@@ -746,6 +757,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HVC_UDBG is not set
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
+# CONFIG_HW_RANDOM is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_GEODE is not set
 # CONFIG_HW_RANDOM_INTEL is not set
@@ -1158,6 +1170,13 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_LZMA_COMPRESS=y
 CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MAC80211 is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MACVTAP is not set
@@ -1202,10 +1221,15 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MIGRATION is not set
 CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_MINI_FO=y
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_FPU_EMU is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SIM is not set
 CONFIG_MISC_DEVICES=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN is not set
@@ -1438,6 +1462,12 @@ CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_U32 is not set
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_EMATCH_CMP is not set
 # CONFIG_NET_EMATCH_META is not set
@@ -1575,11 +1605,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NOZOMI is not set
 # CONFIG_NO_BOOTMEM is not set
 # CONFIG_NO_HZ is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_BENCH is not set
@@ -1708,10 +1741,15 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PLIP is not set
 # CONFIG_PLX_HERMES is not set
 # CONFIG_PM is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERTV is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPC_16K_PAGES is not set
 # CONFIG_PPC_256K_PAGES is not set
@@ -1892,6 +1930,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SCC is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -1936,6 +1975,7 @@ CONFIG_SCSI_DMA=y
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_MPT2SAS is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_MVSAS is not set
@@ -2058,6 +2098,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=2
 # CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
@@ -2077,8 +2118,20 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SFI is not set
 # CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHMEM=y
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
 CONFIG_SIGNALFD=y
 # CONFIG_SIMPLE_GPIO is not set
 # CONFIG_SIS190 is not set
@@ -2257,7 +2310,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_ORION is not set
+# CONFIG_SPI_RB4XX is not set
+# CONFIG_SPI_RB4XX_CPLD is not set
+# CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_VSC7385 is not set
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
@@ -2303,6 +2360,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_TASKSTATS is not set
+# CONFIG_TC35815 is not set
 # CONFIG_TCG_TPM is not set
 # CONFIG_TCIC is not set
 CONFIG_TCP_CONG_ADVANCED=y
@@ -2371,6 +2429,7 @@ CONFIG_TMPFS=y
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
 # CONFIG_TRANZPORT is not set
 # CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_TREE_RCU is not set