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>

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 (file)
index 0000000..afa7e89
--- /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 13d4c08ae8c929b1d31333a32565f1e950dc8966..00466a6f44772f7394b3ca7bf5488b074a080f32 100644 (file)
--- 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"