[meta-lsi] [PATCH 2/7] linux-yocto_3.14: ARM: Correct the header path for lsi-ncr.h
Daniel Dragomir
daniel.dragomir at windriver.com
Fri Aug 5 08:17:28 PDT 2016
Add patch for do_patch task to fix the following error for 3.14
kernel (standard and preempt-rt):
fatal error: mach/ncr.h: No such file or directory
Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
recipes-kernel/linux/linux-yocto-rt_3.14.inc | 5 +-
recipes-kernel/linux/linux-yocto_3.14.inc | 5 +-
recipes-kernel/linux/lsi-tip-rt_3.14.inc | 3 +-
recipes-kernel/linux/lsi-tip_3.14.inc | 4 +-
.../Correct-the-header-path-for-lsi-ncr.patch | 117 +++++++++++++++++++++
5 files changed, 127 insertions(+), 7 deletions(-)
create mode 100644 recipes-kernel/linux/patch/Correct-the-header-path-for-lsi-ncr.patch
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.inc b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
index 0a12a20..6a29515 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/common:\
-${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:${THISDIR}/patch:"
require dt-${KARCH}.inc
@@ -8,5 +8,6 @@ KBRANCH = "standard/preempt-rt/axxia/base"
SRCREV_machine ="${AUTOREV}"
SRCREV_meta ="${AUTOREV}"
SRC_URI += "file://fit"
+SRC_URI += "file://Correct-the-header-path-for-lsi-ncr.patch"
require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/linux-yocto_3.14.inc b/recipes-kernel/linux/linux-yocto_3.14.inc
index 61b8300..c5665c7 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto_3.14.inc
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/common:\
-${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:${THISDIR}/patch:"
require dt-${KARCH}.inc
@@ -8,5 +8,6 @@ KBRANCH = "standard/axxia/base"
SRCREV_machine ="${AUTOREV}"
SRCREV_meta ="${AUTOREV}"
SRC_URI += "file://fit"
+SRC_URI += "file://Correct-the-header-path-for-lsi-ncr.patch"
require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.14.inc b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
index fe36132..4049551 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:${THISDIR}/patch:"
require dt-${KARCH}.inc
@@ -11,3 +11,4 @@ SRCREV_machine ="${AUTOREV}"
SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine"
SRC_URI += "file://fit"
SRC_URI += "file://defconfig"
+SRC_URI += "file://Correct-the-header-path-for-lsi-ncr.patch"
diff --git a/recipes-kernel/linux/lsi-tip_3.14.inc b/recipes-kernel/linux/lsi-tip_3.14.inc
index 1da127e..ad257f7 100644
--- a/recipes-kernel/linux/lsi-tip_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip_3.14.inc
@@ -1,7 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:${THISDIR}/patch:"
require dt-${KARCH}.inc
-
LSI_KERNEL_TAG = "tip"
LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
KBRANCH = "standard/axxia-dev/base"
@@ -11,3 +10,4 @@ SRCREV_machine ="${AUTOREV}"
SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine"
SRC_URI += "file://fit"
SRC_URI += "file://defconfig"
+SRC_URI += "file://Correct-the-header-path-for-lsi-ncr.patch"
diff --git a/recipes-kernel/linux/patch/Correct-the-header-path-for-lsi-ncr.patch b/recipes-kernel/linux/patch/Correct-the-header-path-for-lsi-ncr.patch
new file mode 100644
index 0000000..7d14dc0
--- /dev/null
+++ b/recipes-kernel/linux/patch/Correct-the-header-path-for-lsi-ncr.patch
@@ -0,0 +1,117 @@
+From 9db56216fb18eb37e982062a4e6f27813e94d31f Mon Sep 17 00:00:00 2001
+From: Daniel Dragomir <daniel.dragomir at windriver.com>
+Date: Wed, 20 Apr 2016 15:05:21 +0300
+Subject: [PATCH] drivers/misc/lsi-ncr.c: Correct the header path for lsi-ncr.h
+
+After the following commit, local library <mach/ncr.h> was removed
+in a cleanup effort and it will be use the one from include/linux.
+ 837f4f4cbe47ee2cd2f54b4c9e0f2623bbb00954
+ axxia: Clean Up Axxia NCR Driver
+
+Also remove the references to AXXIA_NCR_RESET_CHECK as long as it's
+not used from the following commit:
+ 6e41280fbeb60c0dd1791cb5eedc6e01bb24273f
+ axxia: Remove References to AXXIA_NCR_RESET_CHECK
+
+Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
+---
+ arch/arm/mach-axxia/axxia.c | 6 +-----
+ arch/arm/mach-axxia/ddr_retention.c | 9 +--------
+ arch/arm/mach-axxia/perf_event_platform.c | 2 +-
+ arch/arm/mach-axxia/rapidio.c | 2 +-
+ arch/arm/mach-axxia/smon.c | 2 +-
+ 5 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/arch/arm/mach-axxia/axxia.c b/arch/arm/mach-axxia/axxia.c
+index b807ed8..12d4a9a 100644
+--- a/arch/arm/mach-axxia/axxia.c
++++ b/arch/arm/mach-axxia/axxia.c
+@@ -50,7 +50,7 @@
+ #include <mach/timers.h>
+ #include <mach/axxia-gic.h>
+ #include <linux/irqchip/arm-gic.h>
+-#include <mach/ncr.h>
++#include <linux/lsi-ncr.h>
+ #include "axxia.h"
+ #include "pci.h"
+ #ifdef CONFIG_AXXIA_RIO
+@@ -213,10 +213,6 @@ void __init axxia_dt_init(void)
+ }
+ #endif
+
+-#ifdef AXXIA_NCR_RESET_CHECK
+- ncr_reset_active = 0;
+-#endif
+-
+ bus_register_notifier(&platform_bus_type, &axxia_platform_nb);
+ bus_register_notifier(&amba_bustype, &axxia_amba_nb);
+
+diff --git a/arch/arm/mach-axxia/ddr_retention.c b/arch/arm/mach-axxia/ddr_retention.c
+index b1645b9..d4370aa 100644
+--- a/arch/arm/mach-axxia/ddr_retention.c
++++ b/arch/arm/mach-axxia/ddr_retention.c
+@@ -31,7 +31,7 @@
+ #include <linux/of.h>
+ #include <asm/io.h>
+ #include <asm/cacheflush.h>
+-#include <mach/ncr.h>
++#include <linux/lsi-ncr.h>
+ #include "axxia.h"
+
+ static void __iomem *nca;
+@@ -273,13 +273,6 @@ initiate_retention_reset(void)
+ if (NULL == nca || NULL == apb || NULL == dickens)
+ BUG();
+
+- /*
+- * If the axxia device is in reset then DDR retention is not
+- * possible. Just do an emergency_restart instead.
+- */
+- if (ncr_reset_active)
+- emergency_restart();
+-
+ preempt_disable();
+ cpu_id = smp_processor_id();
+
+diff --git a/arch/arm/mach-axxia/perf_event_platform.c b/arch/arm/mach-axxia/perf_event_platform.c
+index 538fd1a..0210ebd 100644
+--- a/arch/arm/mach-axxia/perf_event_platform.c
++++ b/arch/arm/mach-axxia/perf_event_platform.c
+@@ -47,7 +47,7 @@
+
+ #include <linux/io.h>
+ #include <asm/cacheflush.h>
+-#include <../../../drivers/misc/lsi-ncr.h>
++#include <linux/lsi-ncr.h>
+
+ #include "perf_event_platform.h"
+
+diff --git a/arch/arm/mach-axxia/rapidio.c b/arch/arm/mach-axxia/rapidio.c
+index 4de8787..58524e8 100644
+--- a/arch/arm/mach-axxia/rapidio.c
++++ b/arch/arm/mach-axxia/rapidio.c
+@@ -32,7 +32,7 @@
+ #include <linux/io.h>
+ #include <linux/signal.h>
+
+-#include <mach/ncr.h>
++#include <linux/lsi-ncr.h>
+ #include <mach/rio.h>
+
+ /**
+diff --git a/arch/arm/mach-axxia/smon.c b/arch/arm/mach-axxia/smon.c
+index 313a3ce..16bf413 100644
+--- a/arch/arm/mach-axxia/smon.c
++++ b/arch/arm/mach-axxia/smon.c
+@@ -22,7 +22,7 @@
+ */
+ #include <linux/io.h>
+
+-#include <../../../drivers/misc/lsi-ncr.h>
++#include <linux/lsi-ncr.h>
+
+ #include "smon.h"
+
+--
+1.9.1
+
--
2.7.4
More information about the meta-lsi
mailing list