diff options
author | Florian Fainelli <florian@openwrt.org> | 2011-06-04 13:36:09 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2011-06-04 13:36:09 +0000 |
commit | 72996d2dcb9c6cf38f6179f59393cf6dcc3b5ce1 (patch) | |
tree | 221f36ebd6fe8038d52d4fbbe30ca74efce0f7d6 | |
parent | 20c04271324295452345e75d991b670866624cb0 (diff) | |
download | upstream-72996d2dcb9c6cf38f6179f59393cf6dcc3b5ce1.tar.gz upstream-72996d2dcb9c6cf38f6179f59393cf6dcc3b5ce1.tar.bz2 upstream-72996d2dcb9c6cf38f6179f59393cf6dcc3b5ce1.zip |
update to 2.6.39.1
SVN-Revision: 27107
-rw-r--r-- | target/linux/realview/Makefile | 2 | ||||
-rw-r--r-- | target/linux/realview/config-default | 51 |
2 files changed, 36 insertions, 17 deletions
diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index 91bbc3d026..d0db32dae9 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=2.6.37.6 +LINUX_VERSION:=2.6.39.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/realview/config-default b/target/linux/realview/config-default index 3bc179c3fc..fb5fc01ef0 100644 --- a/target/linux/realview/config-default +++ b/target/linux/realview/config-default @@ -1,5 +1,7 @@ CONFIG_ALIGNMENT_TRAP=y +# CONFIG_ARCH_EXYNOS4 is not set CONFIG_ARCH_HAS_BARRIERS=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_ARCH_REALVIEW=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y @@ -7,11 +9,11 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ARCH_USES_GETTIMEOFFSET is not set +# CONFIG_ARCH_VT8500 is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARM=y CONFIG_ARM_AMBA=y # CONFIG_ARM_CHARLCD is not set -# CONFIG_ARM_ERRATA_411920 is not set # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set @@ -19,6 +21,9 @@ CONFIG_ARM_AMBA=y # 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_GIC=y CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_SP805_WATCHDOG is not set @@ -33,8 +38,8 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BOUNCE=y CONFIG_CACHE_L2X0=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CLKDEV_LOOKUP=y CONFIG_CMDLINE="console=ttyAMA0 mem=128M" -CONFIG_COMMON_CLKDEV=y CONFIG_CPU_32v6=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y @@ -54,14 +59,15 @@ CONFIG_CPU_HAS_PMU=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=y +CONFIG_CPU_V6K=y CONFIG_CPU_V7=y -CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_USER=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_DMA_CACHE_RWFO=y CONFIG_DNOTIFY=y CONFIG_FB=y @@ -70,17 +76,15 @@ CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SM7XX is not set +# CONFIG_FB_WMT_GE_ROPS is not set # CONFIG_FIRMWARE_EDID is not set -CONFIG_FORCE_MAX_ZONEORDER=11 -# CONFIG_FPE_FASTFPE is not set -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set CONFIG_FRAME_POINTER=y +CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IRQ_SHOW=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -90,9 +94,16 @@ CONFIG_HAVE_ARCH_KGDB=y 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 +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_WORK=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y @@ -103,8 +114,9 @@ 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_SPARSE_IRQ=y CONFIG_HOTPLUG_CPU=y -# CONFIG_I2C_VERSATILE is not set CONFIG_ICST=y CONFIG_INITRAMFS_SOURCE="" CONFIG_IP_PNP=y @@ -115,15 +127,16 @@ CONFIG_JFFS2_LZO=y CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_ZLIB=y CONFIG_KEXEC=y +CONFIG_KTIME_SCALAR=y # CONFIG_LEDS is not set CONFIG_LOCAL_TIMERS=y -CONFIG_LOCK_KERNEL=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +CONFIG_MACH_NO_WESTBRIDGE=y CONFIG_MACH_REALVIEW_EB=y CONFIG_MACH_REALVIEW_PB1176=y CONFIG_MACH_REALVIEW_PB11MP=y @@ -131,11 +144,9 @@ CONFIG_MACH_REALVIEW_PBA8=y CONFIG_MACH_REALVIEW_PBX=y CONFIG_MAGIC_SYSRQ=y # CONFIG_MFD_T7L66XB is not set -# CONFIG_MMC_ARMMMCI is not set # CONFIG_MPCORE_WATCHDOG is not set CONFIG_MTD_ARM_INTEGRATOR=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CONCAT=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NEON is not set @@ -148,15 +159,22 @@ CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PCI_SYSCALL is not set CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y +# CONFIG_PL310_ERRATA_588369 is not set +# CONFIG_PL310_ERRATA_727915 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_QUOTACTL is not set # CONFIG_RD_LZMA is not set # CONFIG_REALVIEW_EB_A9MP is not set 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_SDIO_UART is not set # CONFIG_SERIAL_8250 is not set # CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SERIAL_AMBA_PL011=y @@ -165,6 +183,7 @@ 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 CONFIG_SND=y # CONFIG_SND_DRIVERS is not set @@ -183,18 +202,18 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPI_PL022=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_THUMB2_KERNEL is not set CONFIG_TREE_RCU=y CONFIG_UID16=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 |