[kernel/f17] Update ARM configs for 3.8. Fix beagle (OMAP), update vexpress
Peter Robinson
pbrobinson at fedoraproject.org
Tue Mar 5 19:39:10 UTC 2013
commit bbf77164898dc9c5ff88b9632502b7fb35eb161f
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Tue Mar 5 19:38:21 2013 +0000
Update ARM configs for 3.8. Fix beagle (OMAP), update vexpress
config-arm-generic | 8 ++++----
config-arm-omap | 28 ++++++++++++++++++----------
config-arm-tegra | 1 -
config-armv7 | 29 ++++++++++++++++++++++++++---
kernel.spec | 6 +++++-
5 files changed, 53 insertions(+), 19 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 5cd466e..7951f54 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -55,6 +55,8 @@ CONFIG_PL330_DMA=y
# CONFIG_PID_IN_CONTEXTIDR is not set
# Generic options we want for ARM that aren't defualt
+CONFIG_EARLY_PRINTK=y
+
CONFIG_HIGHMEM=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -317,8 +319,6 @@ CONFIG_SERIAL_MAX310X=y
CONFIG_SERIAL_IFX6X60=m
CONFIG_GPIO_74X164=m
-CONFIG_GPIO_PL061=y
-CONFIG_GPIO_MCP23S08=m
CONFIG_GPIO_ADNP=m
CONFIG_GPIO_ARIZONA=m
CONFIG_GPIO_MAX7301=m
@@ -356,13 +356,13 @@ CONFIG_MFD_88PM805=m
CONFIG_MFD_ARIZONA_SPI=m
CONFIG_MFD_MC13XXX_SPI=m
CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_WM5102 is not set
# CONFIG_MFD_WM5110 is not set
# CONFIG_MFD_TPS65912_SPI is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_MAX8907 is not set
diff --git a/config-arm-omap b/config-arm-omap
index 554ce05..38a73b4 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -6,8 +6,6 @@ CONFIG_ARCH_OMAP2PLUS=y
#
# OMAP Feature Selections
#
-CONFIG_OMAP_SMARTREFLEX=y
-CONFIG_OMAP_SMARTREFLEX_CLASS3=y
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MUX_DEBUG is not set
@@ -28,8 +26,6 @@ CONFIG_HWSPINLOCK_OMAP=m
CONFIG_DMA_OMAP=y
# CONFIG_DMADEVICES_VDEBUG is not set
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
-
#
# TI OMAP2/3/4 Specific Features
#
@@ -141,9 +137,18 @@ CONFIG_PM_SLEEP_SMP=y
CONFIG_ARCH_HAS_OPP=y
CONFIG_PM_OPP=y
+# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
+CONFIG_OMAP_BANDGAP=y
CONFIG_OMAP4_THERMAL=y
CONFIG_OMAP5_THERMAL=y
+# OMAP3 thermal/power
+CONFIG_POWER_AVS=y
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
+
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+
#
# OMAP Hardware
#
@@ -196,7 +201,6 @@ CONFIG_LEDS_LP8788=m
CONFIG_MTD_ONENAND_OMAP2=y
CONFIG_HDQ_MASTER_OMAP=m
CONFIG_I2C_OMAP=m
-CONFIG_SPI_OMAP24XX=m
CONFIG_MFD_OMAP_USB_HOST=y
CONFIG_MFD_WL1273_CORE=m
CONFIG_MFD_LP8788=y
@@ -210,10 +214,15 @@ CONFIG_REGULATOR_TPS65910=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_VPFE_CAPTURE=m
CONFIG_VIDEO_OMAP2_VOUT=m
-CONFIG_VIDEO_DM6446_CCDC=m
-# CONFIG_VIDEO_OMAP3 is not set
+CONFIG_VIDEO_OMAP3=m
+CONFIG_VIDEO_VPFE_CAPTURE=m
+# The ones below are for TI Davinci
+# CONFIG_VIDEO_VPSS_SYSTEM is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_VIDEO_DM644X_VPBE is not set
+# CONFIG_VIDEO_DM355_CCDC is not set
+# CONFIG_VIDEO_ISIF is not set
# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVI=m
@@ -258,6 +267,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_PWM=m
CONFIG_BACKLIGHT_PANDORA=m
+
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_DMIC=m
CONFIG_SND_OMAP_SOC_MCBSP=m
@@ -332,8 +342,6 @@ CONFIG_PWM_TWL_LED=m
# CONFIG_TIDSPBRIDGE_BACKTRACE is not set
# CONFIG_OMAP_REMOTEPROC is not set
-# CONFIG_OMAP_BANDGAP is not set
-# CONFIG_OMAP_BANDGAP is not set
# CONFIG_OMAP_IOVMM is not set
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
diff --git a/config-arm-tegra b/config-arm-tegra
index 30f2493..80a15dd 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -111,7 +111,6 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
# CONFIG_DRM_TEGRA_DEBUG is not set
-
# CONFIG_TI_DAC7512 is not set
# CONFIG_SPI_TOPCLIFF_PCH is not set
# CONFIG_SPI_DW_PCI is not set
diff --git a/config-armv7 b/config-armv7
index bbb64ec..0f84775 100644
--- a/config-armv7
+++ b/config-armv7
@@ -54,7 +54,7 @@ CONFIG_HIGHPTE=y
# CONFIG_ARM_LPAE is not set
# CONFIG_THUMB2_KERNEL is not set
# CONFIG_XEN is not set
-CONFIG_HVC_DCC=y
+# CONFIG_HVC_DCC is not set
# CONFIG_VIRTIO_CONSOLE is not set
# CONFIG_ARM_VIRT_EXT is not set
@@ -138,8 +138,10 @@ CONFIG_EARLY_PRINTK=y
CONFIG_LBDAF=y
CONFIG_COMMON_CLK=y
+CONFIG_REGULATOR=y
# Versatile and highbank
+CONFIG_VEXPRESS_CONFIG=y
CONFIG_ARM_TIMER_SP804=y
CONFIG_SERIO_AMBAKMI=m
@@ -177,6 +179,7 @@ CONFIG_I2C_VERSATILE=m
CONFIG_OC_ETM=y
CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
CONFIG_SENSORS_VEXPRESS=m
+CONFIG_REGULATOR_VEXPRESS=m
# unknown and needs review
CONFIG_ARM_AMBA=y
@@ -196,7 +199,6 @@ CONFIG_MVNETA=m
CONFIG_SATA_MV=m
CONFIG_MARVELL_PHY=m
CONFIG_RTC_DRV_S35390A=y
-CONFIG_USB_EHCI_MV=m
# Allwinner a1x
# CONFIG_SUNXI_RFKILL=y
@@ -349,7 +351,7 @@ CONFIG_PINCTRL_SINGLE=m
# GPIO
CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_EM=m
+# CONFIG_GPIO_EM is not set
CONFIG_GPIO_ADNP=m
CONFIG_GPIO_MCP23S08=m
CONFIG_POWER_RESET_GPIO=y
@@ -368,6 +370,26 @@ CONFIG_FB_SSD1307=m
# Regulator drivers
CONFIG_REGULATOR_FAN53555=m
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_REGULATOR_DUMMY is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+
# Needs work/investigation
# CONFIG_ARM_CHARLCD is not set
@@ -421,6 +443,7 @@ CONFIG_PERF_EVENTS=y
# CONFIG_MFD_MAX8907 is not set
# CONFIG_REGULATOR_FAN53555 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_IR_RX51 is not set
# CONFIG_VIDEO_DM6446_CCDC is not set
# CONFIG_PANEL_TAAL is not set
# CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
diff --git a/kernel.spec b/kernel.spec
index 0f5562f..99b5960 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1577,7 +1577,8 @@ BuildKernel() {
make -s ARCH=$Arch V=1 dtbs
mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
- install -m 644 arch/arm/boot/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
+ install -m 644 arch/arm/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
+ rm -f arch/arm/boot/dts/*.dtb
%else
make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
%endif
@@ -2300,6 +2301,9 @@ fi
# '-' | |
# '-'
%changelog
+* Tue Mar 5 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Update ARM configs for 3.8. Fix beagle (OMAP), update vexpress
+
* Tue Mar 05 2013 Josh Boyer <jwboyer at redhat.com>
- CVE-2013-1819 xfs: _xfs_buf_find oops on blocks beyond the filesystem end
(rhbz 918009,918070)
More information about the scm-commits
mailing list