aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/skmm-ep
diff options
context:
space:
mode:
authorZhenhua Luo <zhenhua.luo@nxp.com>2016-06-03 15:49:36 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-06-03 08:46:44 -0300
commita1ce123705d33e5deb5925399a0356a0598178a7 (patch)
tree473f11df9fa155e80ebbeb9f70445273dd41519b /recipes-extended/skmm-ep
parent5187dd78045e88403485237bf12f4a6c64befbd0 (diff)
downloadmeta-freescale-a1ce123705d33e5deb5925399a0356a0598178a7.tar.gz
meta-freescale-a1ce123705d33e5deb5925399a0356a0598178a7.tar.bz2
meta-freescale-a1ce123705d33e5deb5925399a0356a0598178a7.zip
skmm-ep: fix the build error caused by duplicated definition
Remove the duplicated definition to fix the following build errors: | apps/skmm/lib/skmm_sram.c:42:18: error: redefinition of 'pa_to_va' | apps/skmm/lib/skmm_sram.c:51:20: error: redefinition of 'va_to_pa' Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-extended/skmm-ep')
-rw-r--r--recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch40
-rw-r--r--recipes-extended/skmm-ep/skmm-ep_git.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch b/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch
new file mode 100644
index 00000000..afa7e894
--- /dev/null
+++ b/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch
@@ -0,0 +1,40 @@
+skmm-ep: remove duplicated definition
+
+Remove the duplicated definition to fix the following build errors:
+| apps/skmm/lib/skmm_sram.c:42:18: error: redefinition of 'pa_to_va'
+| apps/skmm/lib/skmm_sram.c:51:20: error: redefinition of 'va_to_pa'
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+
+diff --git a/apps/skmm/lib/skmm_sram.c b/apps/skmm/lib/skmm_sram.c
+index 2d84d93..6ab0421 100644
+--- a/apps/skmm/lib/skmm_sram.c
++++ b/apps/skmm/lib/skmm_sram.c
+@@ -39,24 +39,6 @@
+ static phys_addr_t sram_phys_addr;
+ static va_addr_t sram_virt_addr;
+
+-inline va_addr_t pa_to_va(phys_addr_t addr)
+-{
+- va_addr_t offset;
+-
+- offset = (va_addr_t)(addr - sram_phys_addr);
+-
+- return sram_virt_addr + offset;
+-}
+-
+-inline phys_addr_t va_to_pa(va_addr_t addr)
+-{
+- phys_addr_t offset;
+-
+- offset = (phys_addr_t)(addr - sram_virt_addr);
+-
+- return sram_phys_addr + offset;
+-}
+-
+ static int setup_law_for_plt_sram(phys_addr_t l2sram, u32 *size)
+ {
+ int fd;
+--
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index 13d4c08a..00466a6f 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -10,6 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;nobranch=1 \
file://add-two-missing-header-files.patch \
file://skmm-ep-fix-the-inline-function-definition-with-gcc-.patch \
+ file://skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch \
"
SRCREV = "27156a6621c8f6d7f98210b1ca5cd97bde926875"