[kernel] ARM 3.10 merge and general cleanup, Drop dedicated tegra kernel as now Multiplatform enabled, Enable
Peter Robinson
pbrobinson at fedoraproject.org
Fri May 3 10:21:56 UTC 2013
commit 566e158188b14fa483a8a8155e1a5a7ba3500e12
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Fri May 3 11:21:48 2013 +0100
ARM 3.10 merge and general cleanup, Drop dedicated tegra kernel as now Multiplatform enabled, Enable Tegra and UX500 (Snowball) in Multiplatform
Makefile.config | 7 ---
config-arm-omap | 79 ------------------------------------
config-armv7 | 97 ++++++++++++++++++++++++++++++++++++++++-----
config-armv7-generic | 25 ++++++++++-
config-armv7-lpae | 1 -
config-armv7-tegra | 109 --------------------------------------------------
kernel.spec | 7 ++-
7 files changed, 114 insertions(+), 211 deletions(-)
---
diff --git a/Makefile.config b/Makefile.config
index 69b12ba..2d412c4 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -10,7 +10,6 @@ CONFIGFILES = \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config \
$(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config\
- $(CFG)-armv7hl-tegra.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config
@@ -41,9 +40,6 @@ temp-armv7: config-armv7 temp-armv7-generic
temp-armv7-lpae: config-armv7-lpae temp-armv7-generic
perl merge.pl $^ > $@
-temp-armv7-tegra: config-armv7-tegra temp-armv7-generic
- perl merge.pl $^ > $@
-
temp-x86-32: config-x86-32-generic config-x86-generic
perl merge.pl $^ > $@
@@ -113,9 +109,6 @@ kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7
kernel-$(VERSION)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
perl merge.pl $^ arm > $@
-kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7-tegra
- perl merge.pl $^ arm > $@
-
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
perl merge.pl $^ powerpc > $@
diff --git a/config-armv7 b/config-armv7
index 4f27e5c..18230bb 100644
--- a/config-armv7
+++ b/config-armv7
@@ -1,19 +1,17 @@
# ARM unified arch kernel
-CONFIG_CPU_V7=y
-# CONFIG_ARCH_MULTI_V4 is not set
-# CONFIG_ARCH_MULTI_V4T is not set
-# CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
-# This is V6 so we'll eventually support it in v5 unified kernels
+
# CONFIG_ARCH_BCM is not set
CONFIG_ARCH_HIGHBANK=y
CONFIG_ARCH_MVEBU=y
# CONFIG_ARCH_MXC is not set
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_ARCH_PICOXCELL=y
+# CONFIG_ARCH_SIRF is not set
CONFIG_ARCH_SOCFPGA=y
+# CONFIG_PLAT_SPEAR is not set
CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_U8500=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
CONFIG_ARCH_VEXPRESS_DT=y
CONFIG_ARCH_VIRT=y
@@ -235,7 +233,7 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_HW_RANDOM_OMAP=m
-# CONFIG_DRM_TILCDC is not set
+CONFIG_DRM_TILCDC=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_NUM_CRTCS=2
CONFIG_OMAP2_VRAM=y
@@ -391,8 +389,85 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m
CONFIG_HW_RANDOM_PICOXCELL=m
# ST Ericsson
-# CONFIG_I2C_NOMADIK is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
+CONFIG_MACH_HREFV60=y
+CONFIG_MACH_SNOWBALL=y
+CONFIG_MACH_UX500_DT=y
+
+CONFIG_UX500_DEBUG_UART=2
+CONFIG_AB8500_CORE=y
+CONFIG_PINCTRL_ABX500=y
+CONFIG_PINCTRL_AB8500=y
+CONFIG_I2C_NOMADIK=m
+CONFIG_KEYBOARD_NOMADIK=m
+CONFIG_DB8500_THERMAL=y
+CONFIG_UX500_WATCHDOG=m
+CONFIG_SND_SOC_UX500=m
+CONFIG_SND_SOC_UX500_PLAT_DMA=m
+CONFIG_STE_DMA40=y
+CONFIG_HSEM_U8500=m
+CONFIG_CLKSRC_DBX500_PRCMU=y
+CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
+CONFIG_CRYPTO_DEV_UX500=m
+CONFIG_CRYPTO_DEV_UX500_CRYP=m
+CONFIG_CRYPTO_DEV_UX500_HASH=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+# tegra
+CONFIG_ARCH_TEGRA_2x_SOC=y
+CONFIG_ARCH_TEGRA_3x_SOC=y
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+
+CONFIG_SERIAL_TEGRA=y
+
+CONFIG_TEGRA_PCI=y
+CONFIG_TEGRA_IOMMU_GART=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_MMC_SDHCI_TEGRA=m
+
+CONFIG_I2C_TEGRA=m
+
+CONFIG_TEGRA_SYSTEM_DMA=y
+CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA20_APB_DMA=y
+# CONFIG_SPI_TEGRA114 is not set
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_TEGRA20_SLINK=m
+
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA20=y
+CONFIG_PINCTRL_TEGRA30=y
+CONFIG_USB_EHCI_TEGRA=y
+CONFIG_RTC_DRV_TEGRA=y
+
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_WM9712=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA20_AC97=m
+
+# AC100 (PAZ00)
+CONFIG_MFD_NVEC=y
+CONFIG_MFD_TPS80031=y
+CONFIG_KEYBOARD_NVEC=y
+CONFIG_SERIO_NVEC_PS2=y
+CONFIG_NVEC_POWER=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_NVEC_LEDS=y
+CONFIG_NVEC_PAZ00=y
+
+CONFIG_PWM_TEGRA=m
+
+CONFIG_DRM_TEGRA=m
+
+CONFIG_CRYPTO_DEV_TEGRA_AES=m
+
+CONFIG_LEDS_RENESAS_TPU=y
# ZYNQ
CONFIG_LATTICE_ECP3_CONFIG=m
@@ -496,3 +571,5 @@ CONFIG_REGULATOR_LP8755=m
# CONFIG_POWER_RESET_QNAP is not set
# CONFIG_POWER_RESET_RESTART is not set
# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_DRM_TEGRA_DEBUG is not set
+# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 2bde9bb..79b1534 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -2,6 +2,11 @@
# Generic ARM config options
CONFIG_ARM=y
+# CONFIG_ARCH_MULTI_V4 is not set
+# CONFIG_ARCH_MULTI_V4T is not set
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+
CONFIG_CMDLINE=""
CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_HAVE_ARM_TWD=y
@@ -9,6 +14,7 @@ CONFIG_AEABI=y
CONFIG_VFP=y
CONFIG_VFPv3=y
CONFIG_NEON=y
+
CONFIG_ARM_UNWIND=y
CONFIG_ARM_THUMB=y
CONFIG_ARM_THUMBEE=y
@@ -26,7 +32,6 @@ CONFIG_ATAGS=y
CONFIG_ATAGS_PROC=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-
CONFIG_XZ_DEC_ARMTHUMB=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -273,7 +278,6 @@ CONFIG_EEPROM_93XX46=m
# MMC/SD
CONFIG_MMC=y
CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SPI=m
CONFIG_MMC_DW=m
CONFIG_MMC_DW_PLTFM=m
@@ -361,12 +365,12 @@ CONFIG_LCD_AMS369FG06=m
CONFIG_LCD_LMS501KF03=m
CONFIG_LCD_HX8357=m
+# Input
CONFIG_INPUT_PWM_BEEPER=m
CONFIG_INPUT_GP2A=m
CONFIG_INPUT_ARIZONA_HAPTICS=m
CONFIG_INPUT_MC13783_PWRBUTTON=m
-
CONFIG_TOUCHSCREEN_ADS7846=m
CONFIG_TOUCHSCREEN_AD7877=m
CONFIG_TOUCHSCREEN_MC13783=m
@@ -376,6 +380,18 @@ CONFIG_LEDS_DAC124S085=m
CONFIG_LEDS_PWM=m
CONFIG_BMP085_SPI=m
+# Display
+
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+
# Ethernet
CONFIG_KS8851=m
CONFIG_ENC28J60=m
@@ -450,6 +466,9 @@ CONFIG_PERF_EVENTS=y
# CONFIG_SERIAL_IFX6X60 is not set
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
+# CONFIG_SPI_DW_PCI is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_PXA2XX is not set
# these modules all fail with missing __bad_udelay
# http://www.spinics.net/lists/arm/msg15615.html provides some background
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 714e778..ec1d132 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -1,5 +1,4 @@
# ARM unified arch kernel
-CONFIG_CPU_V7=y
CONFIG_ARCH_EXYNOS=y
CONFIG_ARCH_VIRT=y
diff --git a/kernel.spec b/kernel.spec
index 2afd69b..f0c6aae 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1451,8 +1451,6 @@ mkdir configs
rm -f kernel-%{version}-*debug.config
%endif
-rm -f kernel-%{version}-arm*.config
-
# now run oldconfig over all the config files
for i in *.config
do
@@ -2266,6 +2264,11 @@ fi
# ||----w |
# || ||
%changelog
+* Fri May 3 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- ARM 3.10 merge and general cleanup
+- Drop dedicated tegra kernel as now Multiplatform enabled
+- Enable Tegra and UX500 (Snowball) in Multiplatform
+
* Thu May 02 2013 Josh Boyer <jwboyer at redhat.com> - 3.10.0-0.rc0.git13.1
- Linux v3.9-8153-g5a148af
More information about the scm-commits
mailing list