LINARO: Update configs

s5pv310 is now exynos4 but package name remains the same for now

Signed-off-by: John Rigby <john.rigby@linaro.org>

7 files changed, 34 insertions, 33 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index a1ddb81490cd..6e6bbacbd30f 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -6,9 +6,9 @@ CONFIG_ABX500_CORE=y
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
+# CONFIG_ARCH_EXYNOS4 is not set
 CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_S5PV310 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_U8500 is not set
@@ -149,8 +149,6 @@ CONFIG_FUSE_FS=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_HAVE_TRACE_CLOCK is not set
-CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HIDRAW is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index fe28afc06482..3fa26928ae84 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -7,9 +7,9 @@ CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_AFS_FS=m
 CONFIG_AF_RXRPC=m
+# CONFIG_ARCH_EXYNOS4 is not set
 # CONFIG_ARCH_MXC is not set
 CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_S5PV310 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_U8500 is not set
@@ -164,8 +164,6 @@ CONFIG_GFS2_FS=m
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_BASIC_MMIO=y
 CONFIG_HAMRADIO=y
-CONFIG_HAVE_TRACE_CLOCK=y
-# CONFIG_HAVE_TRACE_CLOCK_GENERIC is not set
 CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_HIDRAW=y
@@ -387,6 +385,7 @@ CONFIG_PERF_COUNTERS=y
 CONFIG_PHONE=m
 CONFIG_PHONET=m
 CONFIG_PID_NS=y
+CONFIG_PL310_ERRATA_727915=y
 CONFIG_PM=y
 CONFIG_POHMELFS=m
 CONFIG_POWER_SUPPLY=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 8e61386e5471..709e27af29d4 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -6,9 +6,9 @@
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_ARCH_EXYNOS4=y
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_S5PV310=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_ARCH_U8500 is not set
@@ -154,8 +154,6 @@ CONFIG_FUSE_FS=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_HAVE_TRACE_CLOCK is not set
-CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HIDRAW is not set
@@ -364,6 +362,7 @@ CONFIG_NR_CPUS=2
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+# CONFIG_PL310_ERRATA_727915 is not set
 # CONFIG_PM is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index f96de80f3526..7f1318e8fb56 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -6,9 +6,9 @@ CONFIG_ABX500_CORE=y
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
+# CONFIG_ARCH_EXYNOS4 is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_S5PV310 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCH_U8500=y
@@ -158,8 +158,6 @@ CONFIG_FUSE_FS=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_HAVE_TRACE_CLOCK is not set
-CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HIDRAW is not set
@@ -372,6 +370,7 @@ CONFIG_NR_CPUS=2
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+# CONFIG_PL310_ERRATA_727915 is not set
 CONFIG_PM=y
 # CONFIG_POHMELFS is not set
 # CONFIG_POWER_SUPPLY is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index c6dc446e8a8e..733f2dd86ab2 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -6,9 +6,9 @@ CONFIG_AC97_BUS=y
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
+# CONFIG_ARCH_EXYNOS4 is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_S5PV310 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_U8500 is not set
@@ -155,8 +155,6 @@ CONFIG_FREEZER=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIOLIB is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_HAVE_TRACE_CLOCK is not set
-CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HIDRAW is not set
@@ -369,6 +367,7 @@ CONFIG_OABI_COMPAT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+# CONFIG_PL310_ERRATA_727915 is not set
 CONFIG_PM=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index c4d3c6217925..afa0e4581a41 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -450,6 +450,7 @@ CONFIG_CPU_COPY_V6=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_CPU_EXYNOS4210=y
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEBUG is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -473,7 +474,6 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_S5PV310=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
 CONFIG_CRASH_DUMP=y
@@ -542,7 +542,6 @@ CONFIG_DEBUG_S3C_UART=1
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_TRACE_CLOCK is not set
 CONFIG_DEBUG_USER=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
@@ -751,6 +750,16 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXYNOS4_DEV_PD=y
+CONFIG_EXYNOS4_DEV_SYSMMU=y
+# CONFIG_EXYNOS4_MCT is not set
+# CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
+# CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
+CONFIG_EXYNOS4_SETUP_I2C1=y
+CONFIG_EXYNOS4_SETUP_I2C5=y
+CONFIG_EXYNOS4_SETUP_KEYPAD=y
+CONFIG_EXYNOS4_SETUP_SDHCI=y
+CONFIG_EXYNOS4_SETUP_SDHCI_GPIO=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FANOTIFY is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
@@ -890,7 +899,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
-# CONFIG_HAVE_GET_CYCLES is not set
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_WORK=y
@@ -900,7 +908,6 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LTT_DUMP_TABLES=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_HAVE_OPROFILE=y
@@ -911,8 +918,6 @@ CONFIG_HAVE_S3C2410_I2C=y
 CONFIG_HAVE_S3C_RTC=y
 CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_HAVE_TRACE_CLOCK_32_TO_64=y
-# CONFIG_HAVE_UNSYNCHRONIZED_TSC is not set
 CONFIG_HDLC=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
@@ -1348,6 +1353,7 @@ CONFIG_KEYBOARD_MAX7359=m
 # CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
 CONFIG_KEYBOARD_STMPE=y
 # CONFIG_KEYBOARD_TC3589X is not set
 CONFIG_KEYBOARD_TCA6416=m
@@ -1363,6 +1369,7 @@ CONFIG_KS8851=m
 CONFIG_KS959_DONGLE=m
 CONFIG_KSDAZZLE_DONGLE=m
 # CONFIG_KSM is not set
+CONFIG_KTIME_SCALAR=y
 CONFIG_KXSD9=m
 CONFIG_L2TP_DEBUGFS=m
 # CONFIG_L2TP_V3 is not set
@@ -1457,6 +1464,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL_HT=y
 # CONFIG_MAC80211_RC_PID is not set
+# CONFIG_MACH_ARMLEX4210 is not set
 # CONFIG_MACH_CM_T35 is not set
 CONFIG_MACH_CM_T3517=y
 CONFIG_MACH_CRANEBOARD=y
@@ -1468,11 +1476,13 @@ CONFIG_MACH_IGEP0030=y
 # CONFIG_MACH_MX51_3DS is not set
 CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MACH_MX51_EFIKAMX=y
+CONFIG_MACH_MX51_EFIKASB=y
 # CONFIG_MACH_MX53_EVK is not set
 # CONFIG_MACH_MX53_LOCO is not set
 # CONFIG_MACH_MX53_SMD is not set
 CONFIG_MACH_NOKIA_RM680=y
 CONFIG_MACH_NOKIA_RX51=y
+# CONFIG_MACH_NURI is not set
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3530_LV_SOM=y
 CONFIG_MACH_OMAP3EVM=y
@@ -1494,11 +1504,10 @@ CONFIG_MACH_SMDKC210=y
 CONFIG_MACH_SMDKV310=y
 CONFIG_MACH_U5500=y
 CONFIG_MACH_U8500=y
-# CONFIG_MACH_UNIVERSAL_C210 is not set
+CONFIG_MACH_UNIVERSAL_C210=y
 # CONFIG_MACVTAP is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MARKERS=y
 CONFIG_MAX1363=m
 CONFIG_MAX1363_RING_BUFFER=y
 CONFIG_MAX63XX_WATCHDOG=m
@@ -1668,6 +1677,7 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 # CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MX51_EFIKA_COMMON=y
 # CONFIG_MXC_DEBUG_BOARD is not set
 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_PWM is not set
@@ -2148,6 +2158,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RXKAD=m
+# CONFIG_S3C24XX_PWM is not set
 # CONFIG_S3C_ADC is not set
 # CONFIG_S3C_BOOT_ERROR_RESET is not set
 CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
@@ -2156,6 +2167,7 @@ CONFIG_S3C_DEV_HSMMC1=y
 CONFIG_S3C_DEV_HSMMC2=y
 CONFIG_S3C_DEV_HSMMC3=y
 CONFIG_S3C_DEV_I2C1=y
+CONFIG_S3C_DEV_I2C5=y
 CONFIG_S3C_DEV_RTC=y
 CONFIG_S3C_DEV_WDT=y
 CONFIG_S3C_GPIO_CFG_S3C24XX=y
@@ -2165,17 +2177,12 @@ CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=1
 CONFIG_S3C_PL330_DMA=y
-CONFIG_S5PV310_DEV_PD=y
-CONFIG_S5PV310_DEV_SYSMMU=y
-# CONFIG_S5PV310_SDHCI_CH0_8BIT is not set
-# CONFIG_S5PV310_SDHCI_CH2_8BIT is not set
-CONFIG_S5PV310_SETUP_I2C1=y
-CONFIG_S5PV310_SETUP_SDHCI=y
-CONFIG_S5PV310_SETUP_SDHCI_GPIO=y
+CONFIG_S5P_DEV_ONENAND=y
 CONFIG_S5P_GPIO_DRVSTR=y
 # CONFIG_S5P_SYSTEM_MMU is not set
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_CLKSRC=y
+CONFIG_SAMSUNG_DEV_KEYPAD=y
 CONFIG_SAMSUNG_GPIOLIB_4BIT=y
 CONFIG_SAMSUNG_GPIO_EXTRA=0
 CONFIG_SAMSUNG_IRQ_UART=y
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index 7edafbe533bf..7fcf9aa97420 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -76,9 +76,9 @@ value CONFIG_IPV6 y
 
 value CONFIG_PRINTK_TIME y
 
-# CONFIG_PM is broken on s5pv310 so don't enforce CONFIG_PM_DEBUG for the moment
-value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_DEBUG y
-value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_ADVANCED_DEBUG y
+# CONFIG_PM is broken on s5pv310 (now exynos4) so don't enforce CONFIG_PM_DEBUG for the moment
+value CONFIG_ARCH_EXYNOS4 y | value CONFIG_PM_DEBUG y
+value CONFIG_ARCH_EXYNOS4 y | value CONFIG_PM_ADVANCED_DEBUG y
 
 # LINARO kernels should be able to boot with a BTRFS rootfs without an initrd
 value CONFIG_BTRFS_FS y