Changeset 33409


Ignore:
Timestamp:
2012-09-14T17:44:25+02:00 (5 years ago)
Author:
florian
Message:

[realview] partially revert r33403

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/realview/config-3.3

    r33403 r33409  
    11CONFIG_ALIGNMENT_TRAP=y 
    22CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y 
     3CONFIG_ARCH_HAS_BARRIERS=y 
    34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 
    45CONFIG_ARCH_NR_GPIO=0 
    56CONFIG_ARCH_REALVIEW=y 
    6 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 
    7 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 
     7CONFIG_ARCH_SELECT_MEMORY_MODEL=y 
     8CONFIG_ARCH_SPARSEMEM_DEFAULT=y 
     9CONFIG_ARCH_SPARSEMEM_ENABLE=y 
    810CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    911# CONFIG_ARCH_USES_GETTIMEOFFSET is not set 
     
    1113CONFIG_ARM=y 
    1214CONFIG_ARM_AMBA=y 
    13 CONFIG_ARM_APPENDED_DTB=y 
    14 # CONFIG_ARM_ATAG_DTB_COMPAT is not set 
    1515# CONFIG_ARM_CHARLCD is not set 
    1616# CONFIG_ARM_CPU_SUSPEND is not set 
     17# CONFIG_ARM_ERRATA_326103 is not set 
     18# CONFIG_ARM_ERRATA_430973 is not set 
     19# CONFIG_ARM_ERRATA_458693 is not set 
     20# CONFIG_ARM_ERRATA_460075 is not set 
     21# CONFIG_ARM_ERRATA_720789 is not set 
     22# CONFIG_ARM_ERRATA_742230 is not set 
     23# CONFIG_ARM_ERRATA_742231 is not set 
     24# CONFIG_ARM_ERRATA_743622 is not set 
     25# CONFIG_ARM_ERRATA_751472 is not set 
     26# CONFIG_ARM_ERRATA_754322 is not set 
     27# CONFIG_ARM_ERRATA_754327 is not set 
     28# CONFIG_ARM_ERRATA_764369 is not set 
    1729CONFIG_ARM_GIC=y 
    18 CONFIG_ARM_L1_CACHE_SHIFT=5 
     30CONFIG_ARM_L1_CACHE_SHIFT=6 
     31CONFIG_ARM_L1_CACHE_SHIFT_6=y 
    1932CONFIG_ARM_NR_BANKS=8 
    2033# CONFIG_ARM_SP805_WATCHDOG is not set 
    2134CONFIG_ARM_THUMB=y 
     35# CONFIG_ARM_THUMBEE is not set 
    2236CONFIG_ARM_TIMER_SP804=y 
    2337CONFIG_ATAGS_PROC=y 
     
    2741CONFIG_BLK_DEV_RAM_COUNT=16 
    2842CONFIG_BLK_DEV_RAM_SIZE=4096 
    29 # CONFIG_CACHE_L2X0 is not set 
     43CONFIG_BOUNCE=y 
     44CONFIG_CACHE_L2X0=y 
    3045CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    3146CONFIG_CLKDEV_LOOKUP=y 
    3247CONFIG_CLKSRC_MMIO=y 
    33 CONFIG_CMDLINE="console=ttyAMA0 mem=128M earlyprintk" 
    34 CONFIG_CMDLINE_FORCE=y 
    35 CONFIG_CPU_32v5=y 
    36 CONFIG_CPU_ABRT_EV5TJ=y 
    37 CONFIG_CPU_ARM926T=y 
    38 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set 
    39 CONFIG_CPU_CACHE_VIVT=y 
    40 CONFIG_CPU_COPY_V4WB=y 
     48CONFIG_CMDLINE="console=ttyAMA0 mem=128M" 
     49CONFIG_CMDLINE_FROM_BOOTLOADER=y 
     50CONFIG_CPU_32v6=y 
     51CONFIG_CPU_32v6K=y 
     52CONFIG_CPU_32v7=y 
     53CONFIG_CPU_ABRT_EV6=y 
     54CONFIG_CPU_ABRT_EV7=y 
     55# CONFIG_CPU_ARM926T is not set 
     56# CONFIG_CPU_BPREDICT_DISABLE is not set 
     57CONFIG_CPU_CACHE_V6=y 
     58CONFIG_CPU_CACHE_V7=y 
     59CONFIG_CPU_CACHE_VIPT=y 
     60CONFIG_CPU_COPY_V6=y 
    4161CONFIG_CPU_CP15=y 
    4262CONFIG_CPU_CP15_MMU=y 
    43 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set 
     63CONFIG_CPU_HAS_ASID=y 
     64CONFIG_CPU_HAS_PMU=y 
    4465# CONFIG_CPU_ICACHE_DISABLE is not set 
    45 CONFIG_CPU_PABRT_LEGACY=y 
    46 CONFIG_CPU_TLB_V4WBI=y 
     66# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set 
     67CONFIG_CPU_PABRT_V6=y 
     68CONFIG_CPU_PABRT_V7=y 
     69CONFIG_CPU_RMAP=y 
     70CONFIG_CPU_TLB_V6=y 
     71CONFIG_CPU_TLB_V7=y 
    4772CONFIG_CPU_USE_DOMAINS=y 
    48 # CONFIG_CPU_V6 is not set 
    49 # CONFIG_CPU_V6K is not set 
    50 # CONFIG_CPU_V7 is not set 
     73CONFIG_CPU_V6=y 
     74CONFIG_CPU_V6K=y 
     75CONFIG_CPU_V7=y 
    5176CONFIG_DEBUG_USER=y 
     77CONFIG_DMA_CACHE_RWFO=y 
    5278CONFIG_DNOTIFY=y 
    53 CONFIG_DTC=y 
    5479CONFIG_FB=y 
    5580CONFIG_FB_ARMCLCD=y 
     
    5984# CONFIG_FB_WMT_GE_ROPS is not set 
    6085CONFIG_FRAME_POINTER=y 
     86CONFIG_GENERIC_ALLOCATOR=y 
    6187CONFIG_GENERIC_ATOMIC64=y 
    6288CONFIG_GENERIC_BUG=y 
    6389CONFIG_GENERIC_CLOCKEVENTS=y 
     90CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y 
    6491CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
    6592CONFIG_GENERIC_IRQ_SHOW=y 
     
    7198CONFIG_HAVE_AOUT=y 
    7299CONFIG_HAVE_ARCH_KGDB=y 
    73 CONFIG_HAVE_ARCH_PFN_VALID=y 
     100# CONFIG_HAVE_ARCH_PFN_VALID is not set 
     101CONFIG_HAVE_ARM_SCU=y 
     102CONFIG_HAVE_ARM_TWD=y 
    74103CONFIG_HAVE_CLK=y 
    75104CONFIG_HAVE_C_RECORDMCOUNT=y 
     
    81110CONFIG_HAVE_GENERIC_DMA_COHERENT=y 
    82111CONFIG_HAVE_GENERIC_HARDIRQS=y 
     112CONFIG_HAVE_HW_BREAKPOINT=y 
    83113CONFIG_HAVE_IRQ_WORK=y 
    84114CONFIG_HAVE_KERNEL_GZIP=y 
     
    86116CONFIG_HAVE_KERNEL_LZO=y 
    87117CONFIG_HAVE_KERNEL_XZ=y 
    88 CONFIG_HAVE_LATENCYTOP_SUPPORT=y 
    89118CONFIG_HAVE_MACH_CLKDEV=y 
    90119CONFIG_HAVE_MEMBLOCK=y 
     120CONFIG_HAVE_MEMORY_PRESENT=y 
    91121CONFIG_HAVE_OPROFILE=y 
     122CONFIG_HAVE_PATA_PLATFORM=y 
    92123CONFIG_HAVE_PERF_EVENTS=y 
    93124CONFIG_HAVE_PROC_CPU=y 
    94125CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y 
    95126CONFIG_HAVE_SCHED_CLOCK=y 
     127CONFIG_HAVE_SMP=y 
    96128CONFIG_HAVE_SPARSE_IRQ=y 
     129CONFIG_HAVE_TCM=y 
     130CONFIG_HOTPLUG_CPU=y 
     131# CONFIG_HW_PERF_EVENTS is not set 
    97132CONFIG_ICST=y 
    98133CONFIG_INITRAMFS_SOURCE="" 
     
    109144CONFIG_KTIME_SCALAR=y 
    110145# CONFIG_LEDS is not set 
     146CONFIG_LOCAL_TIMERS=y 
    111147CONFIG_LOGO=y 
    112148CONFIG_LOGO_LINUX_CLUT224=y 
     
    116152CONFIG_LZO_DECOMPRESS=y 
    117153CONFIG_MACH_REALVIEW_EB=y 
    118 # CONFIG_MACH_REALVIEW_PB1176 is not set 
    119 # CONFIG_MACH_REALVIEW_PB11MP is not set 
    120 # CONFIG_MACH_REALVIEW_PBA8 is not set 
    121 # CONFIG_MACH_REALVIEW_PBX is not set 
     154CONFIG_MACH_REALVIEW_PB1176=y 
     155CONFIG_MACH_REALVIEW_PB11MP=y 
     156CONFIG_MACH_REALVIEW_PBA8=y 
     157CONFIG_MACH_REALVIEW_PBX=y 
    122158CONFIG_MAGIC_SYSRQ=y 
    123159CONFIG_MDIO_BOARDINFO=y 
    124160# CONFIG_MFD_T7L66XB is not set 
     161CONFIG_MIGHT_HAVE_CACHE_L2X0=y 
     162# CONFIG_MPCORE_WATCHDOG is not set 
    125163CONFIG_MTD_CMDLINE_PARTS=y 
    126 CONFIG_MTD_OF_PARTS=y 
    127 # CONFIG_MTD_PHYSMAP_OF is not set 
    128164CONFIG_MULTI_IRQ_HANDLER=y 
     165CONFIG_MUTEX_SPIN_ON_OWNER=y 
    129166CONFIG_NEED_DMA_MAP_STATE=y 
    130167CONFIG_NEED_MACH_MEMORY_H=y 
    131 CONFIG_NEED_PER_CPU_KM=y 
     168# CONFIG_NEON is not set 
    132169CONFIG_NLS=y 
    133 CONFIG_OF=y 
    134 CONFIG_OF_ADDRESS=y 
    135 CONFIG_OF_DEVICE=y 
    136 CONFIG_OF_EARLY_FLATTREE=y 
    137 CONFIG_OF_FLATTREE=y 
    138 CONFIG_OF_IRQ=y 
    139 CONFIG_OF_MDIO=y 
    140 CONFIG_OF_NET=y 
    141 CONFIG_PAGEFLAGS_EXTENDED=y 
     170CONFIG_NR_CPUS=4 
     171CONFIG_OUTER_CACHE=y 
     172CONFIG_OUTER_CACHE_SYNC=y 
    142173CONFIG_PAGE_OFFSET=0xC0000000 
    143174# CONFIG_PCI_SYSCALL is not set 
     
    145176CONFIG_PERF_USE_VMALLOC=y 
    146177CONFIG_PHYLIB=y 
     178# CONFIG_PL310_ERRATA_588369 is not set 
     179# CONFIG_PL310_ERRATA_727915 is not set 
     180# CONFIG_PL310_ERRATA_769419 is not set 
    147181CONFIG_PLAT_VERSATILE=y 
    148182CONFIG_PLAT_VERSATILE_CLCD=y 
     
    150184CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y 
    151185# CONFIG_PREEMPT_RCU is not set 
    152 # CONFIG_PROC_DEVICETREE is not set 
    153186# CONFIG_RD_LZMA is not set 
    154187# CONFIG_REALVIEW_EB_A9MP is not set 
    155 # CONFIG_REALVIEW_EB_ARM11MP is not set 
    156 CONFIG_REALVIEW_HIGH_PHYS_OFFSET=y 
     188CONFIG_REALVIEW_EB_ARM11MP=y 
     189CONFIG_REALVIEW_EB_ARM11MP_REVB=y 
     190CONFIG_REALVIEW_PB1176_SECURE_FLASH=y 
     191CONFIG_RFS_ACCEL=y 
     192CONFIG_RPS=y 
    157193# CONFIG_SCSI_DMA is not set 
    158194# CONFIG_SERIAL_8250 is not set 
     
    161197CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 
    162198CONFIG_SMC91X=y 
     199CONFIG_SMP=y 
     200CONFIG_SMP_ON_UP=y 
    163201CONFIG_SMSC911X=y 
    164202# CONFIG_SMSC911X_ARCH_HOOKS is not set 
     
    178216CONFIG_SOUND_OSS_CORE=y 
    179217CONFIG_SOUND_OSS_CORE_PRECLAIM=y 
    180 CONFIG_SPLIT_PTLOCK_CPUS=999999 
     218CONFIG_SPARSEMEM=y 
     219CONFIG_SPARSEMEM_EXTREME=y 
     220CONFIG_SPARSEMEM_MANUAL=y 
     221CONFIG_STOP_MACHINE=y 
    181222# CONFIG_SWAP is not set 
    182223CONFIG_SYSFS_DEPRECATED=y 
    183224CONFIG_SYSFS_DEPRECATED_V2=y 
    184225CONFIG_SYS_SUPPORTS_APM_EMULATION=y 
     226CONFIG_TREE_RCU=y 
    185227CONFIG_UID16=y 
    186 CONFIG_USE_OF=y 
     228CONFIG_USE_GENERIC_SMP_HELPERS=y 
    187229CONFIG_VECTORS_BASE=0xffff0000 
    188230CONFIG_VFP=y 
     231CONFIG_VFPv3=y 
     232CONFIG_XPS=y 
    189233CONFIG_XZ_DEC=y 
    190234CONFIG_ZBOOT_ROM_BSS=0x0 
    191235CONFIG_ZBOOT_ROM_TEXT=0x0 
    192 CONFIG_ZONE_DMA_FLAG=0 
Note: See TracChangeset for help on using the changeset viewer.