[kernel/f17] ARM: set platform for arm kernel to VEXPRESS allows us to emulate v7 systems and works with fedoras
Dennis Gilmore
ausil at fedoraproject.org
Thu May 17 02:28:42 UTC 2012
commit a4ec16e5442bcea1fe9064ded28762975168f5e4
Author: Dennis Gilmore <dennis at ausil.us>
Date: Wed May 16 21:27:22 2012 -0500
ARM: set platform for arm kernel to VEXPRESS allows us to emulate v7 systems and works with fedoras qemu
ARM: enable SMP everywhere but disable on kirkwood as its up only platform
config-arm-generic | 61 ++++++++++++++++++++++++++++++++++++++++++++++----
config-arm-highbank | 6 -----
config-arm-imx | 4 ---
config-arm-kirkwood | 5 ++++
config-arm-omap | 2 -
config-arm-tegra | 8 ------
kernel.spec | 4 +++
7 files changed, 65 insertions(+), 25 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 5373603..da4830a 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -1,15 +1,34 @@
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_SMP is not set
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
# CONFIG_CMDLINE_FORCE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_ARCH_VERSATILE=y
-CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_MACH_VERSATILE_AB=y
-CONFIG_MACH_VERSATILE_DT=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_PLAT_VERSATILE_CLCD=y
+CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
+CONFIG_PLAT_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
+
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
@@ -36,6 +55,8 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_FPE_NWFPE is not set
CONFIG_FPE_FASTFPE=y
CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
@@ -169,6 +190,36 @@ CONFIG_PL330_DMA=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_LSM_MMAP_MIN_ADDR=32768
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARM_THUMBEE is not set
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CACHE_L2X0=y
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_PL310_ERRATA_588369 is not set
+# CONFIG_PL310_ERRATA_727915 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_PL310_ERRATA_769419 is not set
+CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_LOCAL_TIMERS=y
+# CONFIG_THUMB2_KERNEL is not set
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_SERIAL_AMBA_PL010 is not set
+# CONFIG_MPCORE_WATCHDOG is not set
+
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TDA1004X=m
+
# disable TPM on arm at least on the trimslices it causes havoc
# CONFIG_TCG_TPM is not set
# CONFIG_IMA is not set
diff --git a/config-arm-highbank b/config-arm-highbank
index c20f104..60178dd 100644
--- a/config-arm-highbank
+++ b/config-arm-highbank
@@ -17,10 +17,6 @@ CONFIG_SWP_EMULATE=y
CONFIG_ARM_TIMER_SP804=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-
CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_ATA_SFF=y
@@ -33,5 +29,3 @@ CONFIG_GPIO_PL061=y
CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-# CONFIG_DVB_TDA1004X is not set
-# CONFIG_DVB_PLL is not set
diff --git a/config-arm-imx b/config-arm-imx
index f4c7d26..23e7a5e 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -3,8 +3,6 @@ CONFIG_ARCH_MX51=y
CONFIG_MACH_MX51_BABBAGE=y
CONFIG_MACH_MX51_3DS=y
CONFIG_MACH_EUKREA_CPUIMX51=y
-CONFIG_VFP=y
-CONFIG_NEON=y
CONFIG_MACH_EUKREA_CPUIMX51SD=y
CONFIG_MACH_MX51_EFIKAMX=y
@@ -51,8 +49,6 @@ CONFIG_HW_RANDOM_MXC_RNGA=m
CONFIG_I2C_IMX=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_MCP23S08=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_PLL=m
CONFIG_SND_IMX_SOC=m
CONFIG_USB_EHCI_MXC=y
# CONFIG_USB_IMX21_HCD is not set
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index 592b5aa..d55c89b 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -43,3 +43,8 @@ CONFIG_CRYPTO_DEV_MV_CESA=m
# CONFIG_INPUT_GP2A is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+
+# CONFIG_VFP is not set
+# CONFIG_VFPv3 is not set
+# CONFIG_NEON is not set
+# CONFIG_SMP is not set
diff --git a/config-arm-omap b/config-arm-omap
index 74b4e56..ddcd67d 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -659,8 +659,6 @@ CONFIG_RADIO_TEF6862=m
# CONFIG_TTPCI_EEPROM is not set
# CONFIG_SMS_SDIO_DRV is not set
# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_PLL=m
CONFIG_DRM=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_NUM_CRTCS=2
diff --git a/config-arm-tegra b/config-arm-tegra
index 9037d4b..bc7fbe8 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -5,9 +5,6 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
# CONFIG_ARM_LPAE is not set
CONFIG_TEGRA_PCI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-
CONFIG_MACH_HARMONY=y
CONFIG_MACH_KAEN=y
CONFIG_MACH_PAZ00=y
@@ -20,9 +17,6 @@ CONFIG_MACH_VENTANA=y
CONFIG_TEGRA_DEBUG_UARTD=y
CONFIG_NO_HZ=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
-CONFIG_ARM_CPU_TOPOLOGY=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
@@ -98,8 +92,6 @@ CONFIG_LEDS_RENESAS_TPU=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_INPUT_GP2A is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-# CONFIG_DVB_TDA1004X is not set
-# CONFIG_DVB_PLL is not set
# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
CONFIG_PCI=y
diff --git a/kernel.spec b/kernel.spec
index dca4217..25ec057 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2423,6 +2423,10 @@ fi
# '-' | |
# '-'
%changelog
+* Wed May 16 2012 Dennis Gilmore <dennis at ausil.us>
+- set arch for arm kernel to VEXPRESS allows v7 emulation
+- enable SMP everywhere but disable on kirkwood as its up only
+
* Wed May 16 2012 Justin M. Forbes <jforbes at redhat.com> 3.3.6-3
- fix rtl8187: ->brightness_set can not sleep (rhbz 795176)
More information about the scm-commits
mailing list