[PATCH] UBUNTU: [SRU] [Config] armhf: LEDS_TRIGGER_HEARTBEAT=y

[Paolo Pisati]

BugLink: https://bugs.launchpad.net/bugs/1510165

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/abi/4.2.0-17.21/armhf/generic-lpae.modules | 1 -
 debian.master/abi/4.2.0-17.21/armhf/generic.modules      | 1 -
 debian.master/config/amd64/config.common.amd64           | 1 +
 debian.master/config/annotations                         | 2 +-
 debian.master/config/arm64/config.common.arm64           | 1 +
 debian.master/config/armhf/config.common.armhf           | 1 +
 debian.master/config/config.common.ubuntu                | 1 -
 debian.master/config/i386/config.common.i386             | 1 +
 debian.master/config/powerpc/config.common.powerpc       | 1 +
 debian.master/config/ppc64el/config.common.ppc64el       | 1 +
 10 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian.master/abi/4.2.0-17.21/armhf/generic-lpae.modules b/debian.master/abi/4.2.0-17.21/armhf/generic-lpae.modules
index 0190392..e030f66 100644
--- a/debian.master/abi/4.2.0-17.21/armhf/generic-lpae.modules
+++ b/debian.master/abi/4.2.0-17.21/armhf/generic-lpae.modules
@@ -1847,7 +1847,6 @@ ledtrig-backlight
 ledtrig-camera
 ledtrig-default-on
 ledtrig-gpio
-ledtrig-heartbeat
 ledtrig-oneshot
 ledtrig-timer
 ledtrig-transient
diff --git a/debian.master/abi/4.2.0-17.21/armhf/generic.modules b/debian.master/abi/4.2.0-17.21/armhf/generic.modules
index 64d5a00..8be2748 100644
--- a/debian.master/abi/4.2.0-17.21/armhf/generic.modules
+++ b/debian.master/abi/4.2.0-17.21/armhf/generic.modules
@@ -1870,7 +1870,6 @@ ledtrig-backlight
 ledtrig-camera
 ledtrig-default-on
 ledtrig-gpio
-ledtrig-heartbeat
 ledtrig-oneshot
 ledtrig-timer
 ledtrig-transient
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 66144f1..aba7de1 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -58,6 +58,7 @@ CONFIG_IMA=y
 CONFIG_IPMI_SI_PROBE_DEFAULTS=y
 CONFIG_JUMP_LABEL=y
 CONFIG_KVM=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_TMIO is not set
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 3327ab0..758927e 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1030,7 +1030,7 @@ CONFIG_LEDS_ASIC3				y
 CONFIG_LEDS_SYSCON				y
 
 # Menu: Device Drivers >> LED Support >> LED Class Support >> LED Trigger support
-#CONFIG_LEDS_TRIGGER_HEARTBEAT p policy<(arch armel armhf &/ value y) | value m> note<enables early heartbeat LEDs>
+CONFIG_LEDS_TRIGGER_HEARTBEAT			p mark<ENFORCED> policy<{'armhf': 'y', '*': 'm'}>
 CONFIG_LEDS_TRIGGERS				y
 CONFIG_LEDS_TRIGGER_CPU				y
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 1496f9d..8f258f6 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -60,6 +60,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_KVM=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_TMIO is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 51b9df6..168a328e 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -52,6 +52,7 @@ CONFIG_IMA=y
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 # CONFIG_JUMP_LABEL is not set
 CONFIG_KVM=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_MFD_SM501=y
 CONFIG_MFD_TMIO=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a108f6e..77564a9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4021,7 +4021,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 8fef2dd..9c63051 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -58,6 +58,7 @@ CONFIG_IPMI_SI_PROBE_DEFAULTS=y
 CONFIG_ISA=y
 CONFIG_JUMP_LABEL=y
 CONFIG_KVM=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MFD_SM501=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index a879a2f..6427411 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -48,6 +48,7 @@ CONFIG_IPMI_SI_PROBE_DEFAULTS=y
 # CONFIG_ISA is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_KVM=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_LPARCFG is not set
 CONFIG_MATH_EMULATION=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index ef71d3b..5168d31 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -70,6 +70,7 @@ CONFIG_IRQ_ALL_CPUS=y
 CONFIG_JUMP_LABEL=y
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KVM=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPARCFG=y
 CONFIG_MFD_SM501=m
-- 
2.5.0