From: Florian Fainelli Date: Fri, 14 Sep 2012 15:44:25 +0000 (+0000) Subject: partially revert r33403 X-Git-Tag: reboot~12920 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a2b29c591e82dadbf7e0cc236735125e6e198da5;p=openwrt%2Fstaging%2Fchunkeey.git partially revert r33403 SVN-Revision: 33409 --- diff --git a/target/linux/realview/config-3.3 b/target/linux/realview/config-3.3 index 39ff1c43a8..1fb543a6d8 100644 --- a/target/linux/realview/config-3.3 +++ b/target/linux/realview/config-3.3 @@ -1,24 +1,38 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_HAS_BARRIERS=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_REALVIEW=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARM=y CONFIG_ARM_AMBA=y -CONFIG_ARM_APPENDED_DTB=y -# CONFIG_ARM_ATAG_DTB_COMPAT is not set # CONFIG_ARM_CHARLCD is not set # CONFIG_ARM_CPU_SUSPEND is not set +# CONFIG_ARM_ERRATA_326103 is not set +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_ARM_ERRATA_720789 is not set +# CONFIG_ARM_ERRATA_742230 is not set +# CONFIG_ARM_ERRATA_742231 is not set +# CONFIG_ARM_ERRATA_743622 is not set +# CONFIG_ARM_ERRATA_751472 is not set +# CONFIG_ARM_ERRATA_754322 is not set +# CONFIG_ARM_ERRATA_754327 is not set +# CONFIG_ARM_ERRATA_764369 is not set CONFIG_ARM_GIC=y -CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_NR_BANKS=8 # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set CONFIG_ARM_TIMER_SP804=y CONFIG_ATAGS_PROC=y CONFIG_AUTO_ZRELADDR=y @@ -26,31 +40,42 @@ CONFIG_BCMA_POSSIBLE=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_CACHE_L2X0 is not set +CONFIG_BOUNCE=y +CONFIG_CACHE_L2X0=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y -CONFIG_CMDLINE="console=ttyAMA0 mem=128M earlyprintk" -CONFIG_CMDLINE_FORCE=y -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5TJ=y -CONFIG_CPU_ARM926T=y -# CONFIG_CPU_CACHE_ROUND_ROBIN is not set -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_V4WB=y +CONFIG_CMDLINE="console=ttyAMA0 mem=128M" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +CONFIG_CPU_32v6=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV6=y +CONFIG_CPU_ABRT_EV7=y +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_CACHE_V6=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y CONFIG_CPU_CP15=y CONFIG_CPU_CP15_MMU=y -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_HAS_PMU=y # CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_V4WBI=y +# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set +CONFIG_CPU_PABRT_V6=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_RMAP=y +CONFIG_CPU_TLB_V6=y +CONFIG_CPU_TLB_V7=y CONFIG_CPU_USE_DOMAINS=y -# CONFIG_CPU_V6 is not set -# CONFIG_CPU_V6K is not set -# CONFIG_CPU_V7 is not set +CONFIG_CPU_V6=y +CONFIG_CPU_V6K=y +CONFIG_CPU_V7=y CONFIG_DEBUG_USER=y +CONFIG_DMA_CACHE_RWFO=y CONFIG_DNOTIFY=y -CONFIG_DTC=y CONFIG_FB=y CONFIG_FB_ARMCLCD=y CONFIG_FB_CFB_COPYAREA=y @@ -58,9 +83,11 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FRAME_POINTER=y +CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PCI_IOMAP=y @@ -70,7 +97,9 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAVE_AOUT=y CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y +# CONFIG_HAVE_ARCH_PFN_VALID is not set +CONFIG_HAVE_ARM_SCU=y +CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_CLK=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -80,20 +109,26 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_GENERIC_HARDIRQS=y +CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_IRQ_WORK=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MACH_CLKDEV=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PATA_PLATFORM=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_SCHED_CLOCK=y +CONFIG_HAVE_SMP=y CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_HAVE_TCM=y +CONFIG_HOTPLUG_CPU=y +# CONFIG_HW_PERF_EVENTS is not set CONFIG_ICST=y CONFIG_INITRAMFS_SOURCE="" CONFIG_IP_PNP=y @@ -108,6 +143,7 @@ CONFIG_JFFS2_ZLIB=y CONFIG_KEXEC=y CONFIG_KTIME_SCALAR=y # CONFIG_LEDS is not set +CONFIG_LOCAL_TIMERS=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -115,51 +151,53 @@ CONFIG_LOGO_LINUX_CLUT224=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACH_REALVIEW_EB=y -# CONFIG_MACH_REALVIEW_PB1176 is not set -# CONFIG_MACH_REALVIEW_PB11MP is not set -# CONFIG_MACH_REALVIEW_PBA8 is not set -# CONFIG_MACH_REALVIEW_PBX is not set +CONFIG_MACH_REALVIEW_PB1176=y +CONFIG_MACH_REALVIEW_PB11MP=y +CONFIG_MACH_REALVIEW_PBA8=y +CONFIG_MACH_REALVIEW_PBX=y CONFIG_MAGIC_SYSRQ=y CONFIG_MDIO_BOARDINFO=y # CONFIG_MFD_T7L66XB is not set +CONFIG_MIGHT_HAVE_CACHE_L2X0=y +# CONFIG_MPCORE_WATCHDOG is not set CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_OF_PARTS=y -# CONFIG_MTD_PHYSMAP_OF is not set CONFIG_MULTI_IRQ_HANDLER=y +CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_MACH_MEMORY_H=y -CONFIG_NEED_PER_CPU_KM=y +# CONFIG_NEON is not set CONFIG_NLS=y -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_DEVICE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_IRQ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_NR_CPUS=4 +CONFIG_OUTER_CACHE=y +CONFIG_OUTER_CACHE_SYNC=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PCI_SYSCALL is not set CONFIG_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y +# CONFIG_PL310_ERRATA_588369 is not set +# CONFIG_PL310_ERRATA_727915 is not set +# CONFIG_PL310_ERRATA_769419 is not set CONFIG_PLAT_VERSATILE=y CONFIG_PLAT_VERSATILE_CLCD=y CONFIG_PLAT_VERSATILE_LEDS=y CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y # CONFIG_PREEMPT_RCU is not set -# CONFIG_PROC_DEVICETREE is not set # CONFIG_RD_LZMA is not set # CONFIG_REALVIEW_EB_A9MP is not set -# CONFIG_REALVIEW_EB_ARM11MP is not set -CONFIG_REALVIEW_HIGH_PHYS_OFFSET=y +CONFIG_REALVIEW_EB_ARM11MP=y +CONFIG_REALVIEW_EB_ARM11MP_REVB=y +CONFIG_REALVIEW_PB1176_SECURE_FLASH=y +CONFIG_RFS_ACCEL=y +CONFIG_RPS=y # CONFIG_SCSI_DMA is not set # CONFIG_SERIAL_8250 is not set # CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SMC91X=y +CONFIG_SMP=y +CONFIG_SMP_ON_UP=y CONFIG_SMSC911X=y # CONFIG_SMSC911X_ARCH_HOOKS is not set CONFIG_SMSC_PHY=y @@ -177,16 +215,21 @@ CONFIG_SND_TIMER=y CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y -CONFIG_SPLIT_PTLOCK_CPUS=999999 +CONFIG_SPARSEMEM=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_STOP_MACHINE=y # CONFIG_SWAP is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_TREE_RCU=y CONFIG_UID16=y -CONFIG_USE_OF=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_XPS=y CONFIG_XZ_DEC=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0