From bd0c2617f15f624a3e22f2e6c75fb3c812a15ae1 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 12 Apr 2010 12:21:12 +0000 Subject: [PATCH] ppc40x: sync kernel config Cc: backfire@openwrt.org SVN-Revision: 20819 --- target/linux/ppc40x/config-default | 54 ++++++++++++++++-------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default index 41cc7dd4c9..c2410f32c1 100644 --- a/target/linux/ppc40x/config-default +++ b/target/linux/ppc40x/config-default @@ -2,9 +2,8 @@ CONFIG_405EP=y CONFIG_405EX=y CONFIG_40x=y # CONFIG_44x is not set -CONFIG_4xx_SOC=y CONFIG_4xx=y -# CONFIG_6xx is not set +CONFIG_4xx_SOC=y # CONFIG_ACADIA is not set # CONFIG_ADVANCED_OPTIONS is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -20,20 +19,14 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_AUDIT_ARCH=y -# CONFIG_BINARY_PRINTF is not set CONFIG_BITREVERSE=y # CONFIG_BOOKE_WDT is not set CONFIG_BOUNCE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CMDLINE_BOOL=y +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd" +CONFIG_CMDLINE_BOOL=y CONFIG_CONSISTENT_SIZE=0x00200000 -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DECOMPRESS_LZMA=y # CONFIG_DEFAULT_UIMAGE is not set CONFIG_DEVPORT=y @@ -44,13 +37,16 @@ CONFIG_EARLY_PRINTK=y CONFIG_EXTRA_TARGETS="uImage" CONFIG_FORCE_MAX_ZONEORDER=11 # CONFIG_FSL_ULI1575 is not set +# CONFIG_FSNOTIFY is not set +CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_GENERIC_IOMAP is not set CONFIG_GENERIC_NVRAM=y # CONFIG_GENERIC_TBSYNC is not set @@ -64,6 +60,8 @@ CONFIG_HAS_IOPORT=y # CONFIG_HAS_RAPIDIO is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y @@ -76,15 +74,16 @@ CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_LMB=y -CONFIG_HAVE_MLOCK=y CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set # CONFIG_HCU4 is not set # CONFIG_HOTFOOT is not set CONFIG_HW_RANDOM=y -# CONFIG_HZ_100 is not set CONFIG_HZ=250 +# CONFIG_HZ_100 is not set CONFIG_HZ_250=y +CONFIG_IBM_NEW_EMAC=y # CONFIG_IBM_NEW_EMAC_DEBUG is not set CONFIG_IBM_NEW_EMAC_EMAC4=y CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 @@ -93,21 +92,22 @@ CONFIG_IBM_NEW_EMAC_RXB=256 CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 CONFIG_IBM_NEW_EMAC_TXB=256 -CONFIG_IBM_NEW_EMAC=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_IOMMU_HELPER is not set +CONFIG_IOMMU_HELPER=y # CONFIG_IPIC is not set -CONFIG_IRQ_PER_CPU=y # CONFIG_IRQSTACKS is not set +CONFIG_IRQ_PER_CPU=y CONFIG_ISA_DMA_API=y +# CONFIG_ISDN_CAPI is not set +# CONFIG_ISDN_I4L is not set CONFIG_KERNEL_START=0xc0000000 CONFIG_KILAUEA=y # CONFIG_LEDS_GPIO is not set -# CONFIG_LEDS_GPIO_OF is not set CONFIG_LOWMEM_SIZE=0x30000000 CONFIG_MAGICBOX=y # CONFIG_MAKALU is not set # CONFIG_MATH_EMULATION is not set +CONFIG_MAX_ACTIVE_REGIONS=32 # CONFIG_MMIO_NVRAM is not set # CONFIG_MPIC is not set # CONFIG_MPIC_WEIRD is not set @@ -116,20 +116,22 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP_OF=y +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set CONFIG_NOT_COHERENT_CACHE=y +CONFIG_OF=y CONFIG_OF_DEVICE=y CONFIG_OF_GPIO=y -CONFIG_OF=y CONFIG_OPENRB=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xc0000000 CONFIG_PCI=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y -CONFIG_PCI_DOMAINS=y CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PPC=y CONFIG_PPC32=y CONFIG_PPC40x_SIMPLE=y CONFIG_PPC4xx_PCI_EXPRESS=y @@ -141,22 +143,22 @@ CONFIG_PPC4xx_PCI_EXPRESS=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_CLOCK is not set +CONFIG_PPC_DCR=y # CONFIG_PPC_DCR_MMIO is not set CONFIG_PPC_DCR_NATIVE=y -CONFIG_PPC_DCR=y # CONFIG_PPC_EARLY_DEBUG is not set # CONFIG_PPC_I8259 is not set # CONFIG_PPC_INDIRECT_IO is not set CONFIG_PPC_INDIRECT_PCI=y -# CONFIG_PPC_MM_SLICES is not set CONFIG_PPC_MMU_NOHASH=y +CONFIG_PPC_MMU_NOHASH_32=y +# CONFIG_PPC_MM_SLICES is not set # CONFIG_PPC_MPC106 is not set -CONFIG_PPC_NEED_DMA_SYNC_OPS=y CONFIG_PPC_OF=y CONFIG_PPC_PCI_CHOICE=y # CONFIG_PPC_RTAS is not set CONFIG_PPC_UDBG_16550=y -CONFIG_PPC=y +CONFIG_PPC_WERROR=y # CONFIG_PQ2ADS is not set CONFIG_PRINT_STACK_DEPTH=64 CONFIG_PROC_DEVICETREE=y @@ -171,11 +173,11 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SLAB is not set -# CONFIG_SLOW_WORK is not set CONFIG_SLUB=y CONFIG_SWIOTLB=y CONFIG_TASK_SIZE=0xc0000000 -CONFIG_TRACING_SUPPORT=y +# CONFIG_TREE_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y # CONFIG_WALNUT is not set CONFIG_WORD_SIZE=32 # CONFIG_XILINX_SYSACE is not set