diff --git a/recipes-kernel/linux/linux-omap4-2.6.35.7/omap4430-panda/defconfig b/recipes-kernel/linux/linux-omap4-2.6.35.7/omap4430-panda/defconfig index 1ae74e19..c196f570 100644 --- a/recipes-kernel/linux/linux-omap4-2.6.35.7/omap4430-panda/defconfig +++ b/recipes-kernel/linux/linux-omap4-2.6.35.7/omap4430-panda/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.7 -# Mon Jun 20 11:54:47 2011 +# Wed Nov 9 15:03:06 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -42,10 +42,10 @@ CONFIG_LOCALVERSION="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set +CONFIG_KERNEL_LZO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -284,12 +284,14 @@ CONFIG_OMAP_SMARTREFLEX=y # CONFIG_OMAP_SMARTREFLEX_TESTING is not set CONFIG_OMAP_SMARTREFLEX_CLASS3=y CONFIG_OMAP_ABB=y -# CONFIG_OMAP_ABB_DEFAULT_IVA_FBB is not set +CONFIG_OMAP_ABB_DEFAULT_IVA_FBB=y +# CONFIG_OMAP_SMARTREFLEX_CLASS1P5 is not set CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX=y CONFIG_OMAP_MUX_DEBUG=y CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_TEMP_SENSOR=y CONFIG_OMAP_MBOX_FWK=y CONFIG_OMAP_REMOTE_PROC=y CONFIG_OMAP_IOMMU=y @@ -309,9 +311,11 @@ CONFIG_OMAP_HDMI_AUDIO_WA=y # CONFIG_WIFI_CONTROL_FUNC=y CONFIG_TIWLAN_SDIO=y +CONFIG_TIWLAN_127x=y CONFIG_TIWLAN_MMC_CONTROLLER=5 # CONFIG_OMAP4_ES1 is not set CONFIG_MACH_OMAP_4430SDP=y +# CONFIG_MACH_OMAP_BLAZE is not set CONFIG_MACH_OMAP4_PANDA=y # CONFIG_ERRATA_OMAP4_AXI2OCP is not set # CONFIG_INTERCONNECT_IO_POSTING is not set @@ -319,6 +323,7 @@ CONFIG_MACH_OMAP4_PANDA=y CONFIG_OMAP_ALLOW_OSWR=y # CONFIG_OMAP4_PMD_CLKS_ENABLE is not set # CONFIG_OMAP4_KEEP_STATIC_DEPENDENCIES is not set +CONFIG_OMAP4_TPS62361=y # # Processor Type @@ -357,6 +362,7 @@ CONFIG_CPU_HAS_PMU=y # CONFIG_ARM_ERRATA_460075 is not set # CONFIG_PL310_ERRATA_588369 is not set CONFIG_ARM_ERRATA_720789=y +# CONFIG_ARM_ERRATA_754322 is not set CONFIG_ARM_GIC=y CONFIG_COMMON_CLKDEV=y # CONFIG_FIQ_DEBUGGER is not set @@ -367,6 +373,7 @@ CONFIG_COMMON_CLKDEV=y # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCCARD is not set +# CONFIG_PL310_ERRATA_727915 is not set # # Kernel Features @@ -835,6 +842,7 @@ CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y +# CONFIG_WEXT_GEM is not set CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -912,6 +920,7 @@ CONFIG_UID_STAT=y # CONFIG_BMP085 is not set # CONFIG_WL127X_RFKILL is not set # CONFIG_APANIC is not set +# CONFIG_OMAP4_DUTY_CYCLE is not set # CONFIG_C2PORT is not set # @@ -1213,6 +1222,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_TOUCHSCREEN_SYNTM12XX=y # CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_QUANTUM_OBP is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set CONFIG_INPUT_BH1780=y @@ -1225,6 +1235,7 @@ CONFIG_INPUT_KEYCHORD=y # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_TWL4030_PWRBUTTON is not set # CONFIG_INPUT_TWL4030_VIBRA is not set +# CONFIG_INPUT_TWL6030_PWRBUTTON is not set # CONFIG_INPUT_TWL6040_VIBRA is not set CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y @@ -1234,6 +1245,9 @@ CONFIG_INPUT_SFH7741=y CONFIG_INPUT_CMA3000_I2C=y CONFIG_INPUT_HMC5843=y CONFIG_INPUT_BMP085=y +# CONFIG_INPUT_BMA180 is not set +# CONFIG_INPUT_MPU3050 is not set +# CONFIG_INPUT_TSL2771 is not set # # Hardware I/O ports @@ -1432,6 +1446,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ATXP1 is not set # CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_F71805F is not set +CONFIG_SENSORS_OMAP_BANDGAP_TEMP_SENSOR=y # CONFIG_SENSORS_F71882FG is not set # CONFIG_SENSORS_F75375S is not set # CONFIG_SENSORS_G760A is not set @@ -1544,7 +1559,7 @@ CONFIG_TWL6040_CODEC=y CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set # CONFIG_REGULATOR_DUMMY is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set # CONFIG_REGULATOR_BQ24022 is not set @@ -1553,6 +1568,7 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_MAX8660 is not set CONFIG_REGULATOR_TWL4030=y # CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_TPS6130X is not set # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set CONFIG_MEDIA_SUPPORT=y @@ -1760,11 +1776,14 @@ CONFIG_PANEL_GENERIC=y # CONFIG_PANEL_SHARP_LS037V7DW01 is not set # CONFIG_PANEL_SHARP_LQ043T1DG01 is not set CONFIG_PANEL_PICO_DLP=y +# CONFIG_PANEL_DP501 is not set +# CONFIG_PANEL_D2L is not set CONFIG_PANEL_TAAL=y CONFIG_PANEL_NEC_NL8048HL11_01B=y CONFIG_PANEL_SIL9022=y # CONFIG_PANEL_TOPPOLY_TDO35S is not set # CONFIG_PANEL_TPO_TD043MTEA1 is not set +CONFIG_DSSCOMP=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y # CONFIG_LCD_L4F00242T03 is not set @@ -1776,8 +1795,8 @@ CONFIG_LCD_CLASS_DEVICE=y # CONFIG_LCD_S6E63M0 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y -# CONFIG_BACKLIGHT_PWM is not set -# CONFIG_BACKLIGHT_ADP8860 is not set +CONFIG_BACKLIGHT_PWM=y +CONFIG_BACKLIGHT_ADP8860=y # # Display device support @@ -1844,6 +1863,7 @@ CONFIG_SND_OMAP_SOC_ABE=y CONFIG_SND_OMAP_SOC_DMIC=y CONFIG_SND_OMAP_SOC_VXREC=y CONFIG_SND_OMAP_SOC_SDP4430=y +# CONFIG_SND_OMAP_SOC_OMAP4_PANDA is not set CONFIG_SND_OMAP_SOC_HDMI=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set @@ -2620,7 +2640,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SMACK=y # CONFIG_SECURITY_TOMOYO is not set # CONFIG_IMA is not set -CONFIG_TF_MSHIELD=y +CONFIG_TF_ZEBRA=y CONFIG_SECURITY_MIDDLEWARE_COMPONENT=y CONFIG_SMC_KERNEL_CRYPTO=y CONFIG_SECURE_TRACE=y diff --git a/recipes-kernel/linux/linux-omap4_2.6.35.3.bb b/recipes-kernel/linux/linux-omap4_2.6.35.3.bb deleted file mode 100644 index 9acdb49f..00000000 --- a/recipes-kernel/linux/linux-omap4_2.6.35.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -COMPATIBLE_MACHINE = "omap4430-panda" - -require linux.inc - -# The main PR is now using MACHINE_KERNEL_PR, for omap4 see conf/machine/include/omap4.inc -MACHINE_KERNEL_PR_append = "b" - -CORTEXA8FIXUP = "no" - -SRCREV = "ti-ubuntu-2.6.35-980.1release13" - -SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-ubuntu.git;protocol=git;branch=ti-ubuntu-L24.11 \ - file://0001-tiler-avoid-lock-ups-due-to-unmapped-DMM-entries.patch \ - file://0002-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch \ - file://0003-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch \ - file://0004-ARM-Expose-some-CPU-control-registers-via-sysfs.patch \ - file://0005-ARM-Add-option-to-allow-userspace-PLE-access.patch \ - file://0006-ARM-Add-option-to-allow-userspace-access-to-performa.patch \ - file://0007-OMAP4-do-not-force-select-options-which-are-not-requ.patch \ - file://0008-omap4-pandaboard-add-support-for-DVI-output.patch \ - file://0001-UBUNTU-Config-Fix-FTBS-caused-by-new-binutils.patch \ - file://0002-Add-AFLAGS-for-sleep44xx-to-fix-FTBS.patch \ - file://defconfig \ - " - -S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux-omap4_2.6.35.7.bb b/recipes-kernel/linux/linux-omap4_2.6.35.7.bb index 331433d1..a53c2574 100644 --- a/recipes-kernel/linux/linux-omap4_2.6.35.7.bb +++ b/recipes-kernel/linux/linux-omap4_2.6.35.7.bb @@ -3,13 +3,14 @@ COMPATIBLE_MACHINE = "omap4430-panda" require linux.inc # The main PR is now using MACHINE_KERNEL_PR, for omap4 see conf/machine/include/omap4.inc -MACHINE_KERNEL_PR_append = "b" +MACHINE_KERNEL_PR_append = "c" CORTEXA8FIXUP = "no" -SRCREV = "da1fad8254e6950e8b3a2fb2d610f11a5443b536" +#L24.15 + glp1.4 +SRCREV = "9ceafcf4e34ca25a612c7779104386a27316e962" -SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-ubuntu.git;protocol=git;branch=ti-ubuntu-L24.13 \ +SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-ubuntu.git;protocol=git;branch=glp1.4 \ file://0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch \ file://0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch \ file://defconfig \