From 6f5f87a425a4e54e68321d0910b15eaf32c898d3 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Wed, 19 Apr 2017 16:52:36 +0800 Subject: skmm-ep:update to de6816c New commits: de6816c Add back the implicit Makefile rules Signed-off-by: Chunrong Guo Signed-off-by: Otavio Salvador --- ...-the-inline-function-definition-with-gcc-.patch | 67 ---------------------- ...p-remove-duplicated-pa_to_va-and-va_to_pa.patch | 40 ------------- recipes-extended/skmm-ep/skmm-ep_git.bb | 4 +- 3 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 recipes-extended/skmm-ep/skmm-ep/skmm-ep-fix-the-inline-function-definition-with-gcc-.patch delete mode 100644 recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch diff --git a/recipes-extended/skmm-ep/skmm-ep/skmm-ep-fix-the-inline-function-definition-with-gcc-.patch b/recipes-extended/skmm-ep/skmm-ep/skmm-ep-fix-the-inline-function-definition-with-gcc-.patch deleted file mode 100644 index 7acac8c7..00000000 --- a/recipes-extended/skmm-ep/skmm-ep/skmm-ep-fix-the-inline-function-definition-with-gcc-.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3293321112174ff3247c0ba5c8b9ba9349e0e623 Mon Sep 17 00:00:00 2001 -From: Zhenhua Luo -Date: Mon, 21 Sep 2015 20:38:52 +0800 -Subject: [PATCH] skmm-ep: fix the inline function definition with gcc 5.x - -There are different semantics for inline functions for gcc-5.x compared to -previous gcc. Fix the following build error. -| skmm.c:(.text.startup+0xfc): undefined reference to `va_to_pa' -| skmm.c:(.text.startup+0x10c): undefined reference to `va_to_pa' - -Upstream-Status: Pending - -Signed-off-by: Zhenhua Luo ---- - apps/skmm/include/skmm_sram.h | 13 +++++++++++-- - apps/skmm/lib/skmm_ddr.c | 10 ---------- - 2 files changed, 11 insertions(+), 12 deletions(-) - -diff --git a/apps/skmm/include/skmm_sram.h b/apps/skmm/include/skmm_sram.h -index 4c96874..6208761 100644 ---- a/apps/skmm/include/skmm_sram.h -+++ b/apps/skmm/include/skmm_sram.h -@@ -33,9 +33,18 @@ - #define __SKMM_SRAM_H__ - - #include "common.h" -+#include -+ -+static inline va_addr_t pa_to_va(phys_addr_t addr) -+{ -+ return (va_addr_t)__dma_mem_ptov(addr); -+} -+ -+static inline phys_addr_t va_to_pa(va_addr_t addr) -+{ -+ return (phys_addr_t)__dma_mem_vtop((void *)addr); -+} - --inline phys_addr_t va_to_pa(va_addr_t addr); --inline va_addr_t pa_to_va(phys_addr_t addr); - va_addr_t *fsl_mem_init(phys_addr_t l2_sram_addr); - - #endif /* __SKMM_SRAM_H__ */ -diff --git a/apps/skmm/lib/skmm_ddr.c b/apps/skmm/lib/skmm_ddr.c -index d5a66ce..f1cef89 100644 ---- a/apps/skmm/lib/skmm_ddr.c -+++ b/apps/skmm/lib/skmm_ddr.c -@@ -35,16 +35,6 @@ - #define SKMM_TOTAL_DMA_SIZE (64 * 1024 * 1024) - #define SKMM_DMA_MAP_SIZE (1*1024*1024) - --inline va_addr_t pa_to_va(phys_addr_t addr) --{ -- return (va_addr_t)__dma_mem_ptov(addr); --} -- --inline phys_addr_t va_to_pa(va_addr_t addr) --{ -- return (phys_addr_t)__dma_mem_vtop((void *)addr); --} -- - va_addr_t *fsl_mem_init(phys_addr_t l2_sram_addr) - { - /* - map DMA mem */ --- -1.9.2 - 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 deleted file mode 100644 index afa7e894..00000000 --- a/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - -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 87489660..94649477 100644 --- a/recipes-extended/skmm-ep/skmm-ep_git.bb +++ b/recipes-extended/skmm-ep/skmm-ep_git.bb @@ -9,10 +9,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;branch=sdk-v2.0.x \ 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 = "fc43230ac3044917c9df12e9e4f6a38a4d9b80aa" +SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf