summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2014-09-02 15:50:04 +0300
committerRiku Voipio <riku.voipio@linaro.org>2014-09-02 15:50:04 +0300
commit476c204a9b478c1d5f19ccf338ac80c5428f66ee (patch)
treec9767a7521ef0e77dc5abc65a0b87f0187d3441e
parentf78d088e90e5301ec35a03703dd0270e814df32f (diff)
refresh patches
Also switch to faster git clone
-rw-r--r--configs/gcov-enable.patch8
-rw-r--r--configs/gcov-workarounds.patch214
-rwxr-xr-xjenkins-run2
3 files changed, 114 insertions, 110 deletions
diff --git a/configs/gcov-enable.patch b/configs/gcov-enable.patch
index b649b9e..671dd87 100644
--- a/configs/gcov-enable.patch
+++ b/configs/gcov-enable.patch
@@ -1,7 +1,7 @@
-From 84581e3ff5a2ce86b83c797b8318985b70c12901 Mon Sep 17 00:00:00 2001
+From 1079654d8c41f021f15710cc6e29a0c161b4ef85 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@collabora.co.uk>
Date: Mon, 18 Aug 2014 15:47:32 +0300
-Subject: [PATCH 1/3] Enable gcov support on the ARM architecture
+Subject: [PATCH 1/2] Enable gcov support on the ARM architecture
Enable gcov support for ARM based on original patches by David
Singleton and George G. Davis
@@ -42,7 +42,7 @@ index c394e30..5761f00 100644
--defsym initrd_phys=$(INITRD_PHYS) \
--defsym params_phys=$(PARAMS_PHYS) -T
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
-index 9aee36e..172e606 100644
+index 0f1e6c7..b7a39fb 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -37,6 +37,8 @@ ifeq ($(CONFIG_ARM_VIRT_EXT),y)
@@ -105,7 +105,7 @@ index d04ce8a..cf66c5c 100644
---help---
This options activates profiling for the entire kernel.
diff --git a/lib/Makefile b/lib/Makefile
-index 7ab38f7..6b0a770 100644
+index 78099ea9..f89e964 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,8 @@
diff --git a/configs/gcov-workarounds.patch b/configs/gcov-workarounds.patch
index bc24b14..72cbabc 100644
--- a/configs/gcov-workarounds.patch
+++ b/configs/gcov-workarounds.patch
@@ -1,75 +1,77 @@
-From 6542dead7ee345f106984ffbc52737ddebf356b6 Mon Sep 17 00:00:00 2001
+From d26d8a880ee8819b1ac38a828d9e15d405455ba6 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
-Date: Fri, 22 Aug 2014 11:55:57 +0300
-Subject: gcov: Litter drivers/ with disabling gcov
+Date: Tue, 2 Sep 2014 11:49:36 +0300
+Subject: [PATCH 2/2] Litter drivers with gcov disabling
-Modern ARM kernel needs multiple subsystems functioning before gcov
-can be started.
+Some of the core drivers need to be available before gcov
+can be enabled.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
- drivers/clk/samsung/Makefile | 2 ++
+ drivers/clk/samsung/Makefile | 1 +
drivers/clocksource/Makefile | 2 ++
- drivers/cpufreq/Makefile | 1 +
+ drivers/cpufreq/Makefile | 2 ++
drivers/cpuidle/Makefile | 2 ++
drivers/cpuidle/governors/Makefile | 2 ++
drivers/devfreq/Makefile | 1 +
drivers/devfreq/exynos/Makefile | 1 +
- drivers/extcon/Makefile | 3 +++
- drivers/gpio/Makefile | 1 +
+ drivers/extcon/Makefile | 1 +
drivers/i2c/Makefile | 1 +
drivers/i2c/algos/Makefile | 1 +
- drivers/i2c/busses/Makefile | 2 ++
- drivers/i2c/muxes/Makefile | 1 +
+ drivers/i2c/busses/Makefile | 1 +
drivers/iommu/Makefile | 2 ++
- drivers/irqchip/Makefile | 3 +++
- drivers/mfd/Makefile | 4 +++-
+ drivers/irqchip/Makefile | 2 ++
+ drivers/mfd/Makefile | 3 ++-
drivers/of/Makefile | 1 +
- drivers/regulator/Makefile | 1 +
- 18 files changed, 30 insertions(+), 1 deletion(-)
+ drivers/regulator/Makefile | 2 +-
+ 16 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/samsung/Makefile b/drivers/clk/samsung/Makefile
-index 69e8177..f7c8ba1 100644
+index 6fb4bc6..38504c8 100644
--- a/drivers/clk/samsung/Makefile
+++ b/drivers/clk/samsung/Makefile
-@@ -2,6 +2,8 @@
+@@ -1,6 +1,7 @@
+ #
# Samsung Clock specific Makefile
#
-
+GCOV_PROFILE := n
-+
+
obj-$(CONFIG_COMMON_CLK) += clk.o clk-pll.o
obj-$(CONFIG_SOC_EXYNOS3250) += clk-exynos3250.o
- obj-$(CONFIG_ARCH_EXYNOS4) += clk-exynos4.o
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
-index 800b130..9f063b3 100644
+index 7fd9fd1..0f982e6 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
-@@ -41,3 +41,5 @@ obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o
- obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST) += dummy_timer.o
- obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o
- obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o
-+
+@@ -1,3 +1,5 @@
+GCOV_PROFILE := n
++
+ obj-$(CONFIG_CLKSRC_OF) += clksrc-of.o
+ obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o
+ obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
-index 38bd66f..496dd19 100644
+index a1f7537..2b83e02 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
-@@ -104,3 +104,4 @@ obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o
- obj-$(CONFIG_SPARC_US2E_CPUFREQ) += sparc-us2e-cpufreq.o
- obj-$(CONFIG_SPARC_US3_CPUFREQ) += sparc-us3-cpufreq.o
- obj-$(CONFIG_UNICORE32) += unicore2-cpufreq.o
+@@ -1,4 +1,6 @@
+ # CPUfreq core
+GCOV_PROFILE := n
++
+ obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o
+ obj-$(CONFIG_PM_OPP) += cpufreq_opp.o
+
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
-index d8bb1ff..af8a557 100644
+index 11edb31..4b7c180 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
-@@ -25,3 +25,5 @@ obj-$(CONFIG_MIPS_CPS_CPUIDLE) += cpuidle-cps.o
- # POWERPC drivers
- obj-$(CONFIG_PSERIES_CPUIDLE) += cpuidle-pseries.o
- obj-$(CONFIG_POWERNV_CPUIDLE) += cpuidle-powernv.o
-+
+@@ -2,6 +2,8 @@
+ # Makefile for cpuidle.
+ #
+
+GCOV_PROFILE := n
++
+ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
+ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
+
diff --git a/drivers/cpuidle/governors/Makefile b/drivers/cpuidle/governors/Makefile
index 1b51272..8ed53c7 100644
--- a/drivers/cpuidle/governors/Makefile
@@ -83,82 +85,73 @@ index 1b51272..8ed53c7 100644
obj-$(CONFIG_CPU_IDLE_GOV_LADDER) += ladder.o
obj-$(CONFIG_CPU_IDLE_GOV_MENU) += menu.o
diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile
-index 16138c9..cfddaa4 100644
+index 16138c9..f8c51f4 100644
--- a/drivers/devfreq/Makefile
+++ b/drivers/devfreq/Makefile
-@@ -7,3 +7,4 @@ obj-$(CONFIG_DEVFREQ_GOV_USERSPACE) += governor_userspace.o
- # DEVFREQ Drivers
- obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ) += exynos/
- obj-$(CONFIG_ARM_EXYNOS5_BUS_DEVFREQ) += exynos/
+@@ -1,3 +1,4 @@
+GCOV_PROFILE := n
+ obj-$(CONFIG_PM_DEVFREQ) += devfreq.o
+ obj-$(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND) += governor_simpleondemand.o
+ obj-$(CONFIG_DEVFREQ_GOV_PERFORMANCE) += governor_performance.o
diff --git a/drivers/devfreq/exynos/Makefile b/drivers/devfreq/exynos/Makefile
-index 49bc917..cbe3cba 100644
+index 49bc917..a83c500 100644
--- a/drivers/devfreq/exynos/Makefile
+++ b/drivers/devfreq/exynos/Makefile
@@ -1,3 +1,4 @@
++GCOV_PROFILE := n
# Exynos DEVFREQ Drivers
obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ) += exynos_ppmu.o exynos4_bus.o
obj-$(CONFIG_ARM_EXYNOS5_BUS_DEVFREQ) += exynos_ppmu.o exynos5_bus.o
-+GCOV_PROFILE := n
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
-index bf7861e..dbb22e3 100644
+index b38546e..44b5f47 100644
--- a/drivers/extcon/Makefile
+++ b/drivers/extcon/Makefile
-@@ -10,3 +10,6 @@ obj-$(CONFIG_EXTCON_MAX77693) += extcon-max77693.o
- obj-$(CONFIG_EXTCON_MAX8997) += extcon-max8997.o
- obj-$(CONFIG_EXTCON_ARIZONA) += extcon-arizona.o
- obj-$(CONFIG_EXTCON_PALMAS) += extcon-palmas.o
-+
-+GCOV_PROFILE := n
-+
-diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index d10f6a9..7524e01 100644
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -101,3 +101,4 @@ obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
- obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
- obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o
- obj-$(CONFIG_GPIO_ZEVIO) += gpio-zevio.o
+@@ -1,6 +1,7 @@
+
+ # Makefile for external connector class (extcon) devices
+ #
+GCOV_PROFILE := n
+
+ obj-$(CONFIG_EXTCON) += extcon-class.o
+ obj-$(CONFIG_EXTCON_ADC_JACK) += extcon-adc-jack.o
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
-index 1722f50..8de1671 100644
+index e0228b2..e0423c1 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
-@@ -12,3 +12,4 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o
-
- ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
- CFLAGS_i2c-core.o := -Wno-deprecated-declarations
+@@ -1,6 +1,7 @@
+ #
+ # Makefile for the i2c core.
+ #
+GCOV_PROFILE := n
+
+ i2ccore-y := i2c-core.o
+ i2ccore-$(CONFIG_ACPI) += i2c-acpi.o
diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
-index 215303f..c39d166 100644
+index 215303f..f81adda 100644
--- a/drivers/i2c/algos/Makefile
+++ b/drivers/i2c/algos/Makefile
-@@ -7,3 +7,4 @@ obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
- obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
-
- ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
+@@ -1,6 +1,7 @@
+ #
+ # Makefile for the i2c algorithms
+ #
+GCOV_PROFILE := n
+
+ obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o
+ obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
-index dd9a7f8..3e394c6 100644
+index 49bf07e..608091b 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
-@@ -104,3 +104,5 @@ obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
- obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o
-
- ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
-+
+@@ -1,6 +1,7 @@
+ #
+ # Makefile for the i2c bus drivers.
+ #
+GCOV_PROFILE := n
-diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
-index 465778b..f13be72 100644
---- a/drivers/i2c/muxes/Makefile
-+++ b/drivers/i2c/muxes/Makefile
-@@ -9,3 +9,4 @@ obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o
- obj-$(CONFIG_I2C_MUX_PINCTRL) += i2c-mux-pinctrl.o
- ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
-+GCOV_PROFILE := n
+ # ACPI drivers
+ obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
-index 8893bad..42e456c 100644
+index 16edef7..406d63c 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,3 +1,5 @@
@@ -166,48 +159,59 @@ index 8893bad..42e456c 100644
+
obj-$(CONFIG_IOMMU_API) += iommu.o
obj-$(CONFIG_IOMMU_API) += iommu-traces.o
- obj-$(CONFIG_OF_IOMMU) += of_iommu.o
+ obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
-index 62a13e5..256b4d4 100644
+index 73052ba..c9073f4 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
-@@ -30,3 +30,6 @@ obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o
- obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o
- obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o
- obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o
-+
+@@ -1,3 +1,5 @@
+GCOV_PROFILE := n
+
+ obj-$(CONFIG_IRQCHIP) += irqchip.o
+
+ obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index 4c52a6a6..95575a8 100644
+index 3f2fc89..d2ce0b8 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
-@@ -2,6 +2,8 @@
+@@ -1,6 +1,7 @@
+ #
# Makefile for multifunction miscellaneous devices
#
-
+GCOV_PROFILE := n
-+
+
88pm860x-objs := 88pm860x-core.o 88pm860x-i2c.o
obj-$(CONFIG_MFD_88PM860X) += 88pm860x.o
- obj-$(CONFIG_MFD_88PM800) += 88pm800.o 88pm80x.o
+@@ -83,10 +84,10 @@ obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o
+ obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o
+
+ obj-$(CONFIG_MFD_CORE) += mfd-core.o
+-
+ obj-$(CONFIG_EZX_PCAP) += ezx-pcap.o
+
+ obj-$(CONFIG_MCP) += mcp-core.o
++
+ obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o
+ obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o
+ obj-$(CONFIG_MFD_SMSC) += smsc-ece1099.o
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index 099b1fb..d314867 100644
+index 2b6a7b1..0ae195d 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
-@@ -14,3 +14,4 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
-
- CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt
- CFLAGS_fdt_address.o = -I$(src)/../../scripts/dtc/libfdt
+@@ -1,3 +1,4 @@
+GCOV_PROFILE := n
+ obj-y = base.o device.o platform.o
+ obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
+ obj-$(CONFIG_OF_FLATTREE) += fdt.o
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
-index aede918..7dedd57 100644
+index 9c50dc6..309fb0e 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
-@@ -2,6 +2,7 @@
+@@ -1,7 +1,7 @@
+ #
# Makefile for regulator drivers.
#
-
+-
+GCOV_PROFILE := n
obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o helpers.o devres.o
diff --git a/jenkins-run b/jenkins-run
index d529e3a..0b6a1d4 100755
--- a/jenkins-run
+++ b/jenkins-run
@@ -6,7 +6,7 @@ sudo rm -rf build binary
. ./gcov-ci/configs/${hwpack}.template
-time git clone ${git_url} --branch ${git_branch} build
+time git clone --depth 1 ${git_url} --branch ${git_branch} build
cp -a gcov-ci build/
cd build