aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenhua Luo <zhenhua.luo@nxp.com>2016-08-15 17:32:28 +0800
committerZhenhua Luo <zhenhua.luo@nxp.com>2016-08-15 17:32:28 +0800
commit0222ea37fdeb44128e8f667c2af36684e1560d5d (patch)
treef7204e8241b87e075273e6551da2bf9ee7aa2178
parentf5b6d957c9f237b8294dbe4a98495265f111ed68 (diff)
downloadmeta-fsl-ppc-0222ea37fdeb44128e8f667c2af36684e1560d5d.tar.gz
meta-fsl-ppc-0222ea37fdeb44128e8f667c2af36684e1560d5d.tar.bz2
meta-fsl-ppc-0222ea37fdeb44128e8f667c2af36684e1560d5d.zip
ipc-ust: obey LDFLAGS to fix GNU_HASH error
Signed-off-by: Ting Liu <ting.liu@nxp.com> Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
-rw-r--r--recipes-bsp/ipc/ipc-ust/Makefile-use-LDFLAGS-if-set.patch86
-rw-r--r--recipes-bsp/ipc/ipc.inc5
2 files changed, 89 insertions, 2 deletions
diff --git a/recipes-bsp/ipc/ipc-ust/Makefile-use-LDFLAGS-if-set.patch b/recipes-bsp/ipc/ipc-ust/Makefile-use-LDFLAGS-if-set.patch
new file mode 100644
index 0000000..e991f70
--- /dev/null
+++ b/recipes-bsp/ipc/ipc-ust/Makefile-use-LDFLAGS-if-set.patch
@@ -0,0 +1,86 @@
+From 4c0accfce78610e21f5d9b75725a0b9fa2c6cfb9 Mon Sep 17 00:00:00 2001
+From: Ting Liu <ting.liu@nxp.com>
+Date: Fri, 12 Aug 2016 10:41:51 +0800
+Subject: [PATCH] Makefile: use LDFLAGS if set
+
+Signed-off-by: Ting Liu <ting.liu@nxp.com>
+---
+ dsp_boot/Makefile | 6 +++---
+ fsl_shm/Makefile | 4 ++--
+ ipc/Makefile | 14 +++++++-------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/dsp_boot/Makefile b/dsp_boot/Makefile
+index 8f30076..59eb648 100644
+--- a/dsp_boot/Makefile
++++ b/dsp_boot/Makefile
+@@ -20,12 +20,12 @@ endif
+ all: fsl_shm lib_dsp_boot dsp_bt
+ lib_dsp_boot:
+ $(CC) -c ./libdspboot.c $(CFLAGS) -o ./libdspboot.o
+- $(CC) -shared -fPIC ./libdspboot.o -o libdspboot.so
++ $(CC) -shared -fPIC $(LDFLAGS) ./libdspboot.o -o libdspboot.so
+ $(AR) rcs libdspboot.a ./libdspboot.o ../fsl_shm/lib/lg_shm.o
+ fsl_shm:
+- $(CC) -c $(CFLAGS) $(SOURCES_FSL_SHM)
++ $(CC) -c $(CFLAGS) $(LDFLAGS) $(SOURCES_FSL_SHM)
+ dsp_bt:
+- $(CC) $(CFLAGS) $(SOURCES) $(SOURCES_FSL_SHM) -L. -ldspboot -L../ipc -lipc -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SOURCES) $(SOURCES_FSL_SHM) -L. -ldspboot -L../ipc -lipc -o $@
+ cp libdspboot.so ../ipc/ -v
+ clean:
+ rm -rf *.o dsp_bt libdspboot.so *.a
+diff --git a/fsl_shm/Makefile b/fsl_shm/Makefile
+index 0042055..0b9f581 100644
+--- a/fsl_shm/Makefile
++++ b/fsl_shm/Makefile
+@@ -4,11 +4,11 @@ CFLAGS=-fPIC -I ./lib -I ./include -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -W
+
+ all: lg_shm_lib lg_shm_test
+ lg_shm_lib:
+- $(CC) -c ./lib/lg_shm.c $(CFLAGS) -o ./lib/lg_shm.o
++ $(CC) -c ./lib/lg_shm.c $(CFLAGS) $(LDFLAGS) -o ./lib/lg_shm.o
+ $(AR) rcs liblg_shm.a ./lib/lg_shm.o
+
+ lg_shm_test:
+- $(CC) ./test/app.c $(CFLAGS) -L. -llg_shm -o app
++ $(CC) ./test/app.c $(CFLAGS) $(LDFLAGS) -L. -llg_shm -o app
+
+ clean:
+ rm -rf app ./lib/*.o *.a
+diff --git a/ipc/Makefile b/ipc/Makefile
+index 06599f6..cbb63d6 100644
+--- a/ipc/Makefile
++++ b/ipc/Makefile
+@@ -29,21 +29,21 @@ ipc_lib:
+ $(CC) -c ./lib/fsl_user_dma.c $(CFLAGS) -o ./lib/fsl_user_dma.o
+ $(CC) -c ./lib/fsl_ipc_lock.c $(CFLAGS) -o ./lib/fsl_ipc_lock.o
+ $(CC) -c ../dsp_boot/libdspboot.c $(CFLAGS2) -o ../dsp_boot/libdspboot.o
+- $(CC) -shared -fPIC -lpthread ./lib/fsl_user_dma.o ./lib/fsl_ipc_channel.o ./lib/fsl_ipc_lock.o ../dsp_boot/libdspboot.o -L../fsl_shm -llg_shm -o libipc.so
++ $(CC) -shared -fPIC -lpthread $(LDFLAGS) ./lib/fsl_user_dma.o ./lib/fsl_ipc_channel.o ./lib/fsl_ipc_lock.o ../dsp_boot/libdspboot.o -L../fsl_shm -llg_shm -o libipc.so
+ $(AR) rcs libipc.a ./lib/fsl_ipc_channel.o ./lib/fsl_ipc_lock.o ../dsp_boot/libdspboot.o ./lib/fsl_user_dma.o ../fsl_shm/lib/lg_shm.o
+
+ mem_lib:
+ $(CC) -c ./lib/fsl_usmmgr.c $(CFLAGS) -o ./lib/fsl_usmmgr.o
+ $(CC) -c ./lib/fsl_ipc_lock.c $(CFLAGS) -o ./lib/fsl_ipc_lock.o
+- $(CC) -shared -fPIC ./lib/fsl_usmmgr.o ./lib/fsl_ipc_lock.o -L../fsl_shm -llg_shm -o libmem.so
++ $(CC) -shared -fPIC $(LDFLAGS) ./lib/fsl_usmmgr.o ./lib/fsl_ipc_lock.o -L../fsl_shm -llg_shm -o libmem.so
+ $(AR) rcs libmem.a ./lib/fsl_usmmgr.o ./lib/fsl_ipc_lock.o ../fsl_shm/lib/lg_shm.o
+
+ ipc_test:
+- $(CC) ./test/ipc_test.c $(CFLAGS) -L. -lipc -lmem -o ipc_test
+- $(CC) ./test/ipc_test67.c $(CFLAGS) -L. -lipc -lmem -o ipc_test67
+- $(CC) ./test/dsp_recover.c $(CFLAGS) -L. -lipc -lmem -o dsp_recover
+- $(CC) ./test/l1_defense_app.c $(CFLAGS) -L. -lipc -lmem -o l1d_app
+- $(CC) ./test/fsl_dump_memory.c $(CFLAGS) -L. -lipc -lmem -o dump_mem
++ $(CC) ./test/ipc_test.c $(CFLAGS) $(LDFLAGS) -L. -lipc -lmem -o ipc_test
++ $(CC) ./test/ipc_test67.c $(CFLAGS) $(LDFLAGS) -L. -lipc -lmem -o ipc_test67
++ $(CC) ./test/dsp_recover.c $(CFLAGS) $(LDFLAGS) -L. -lipc -lmem -o dsp_recover
++ $(CC) ./test/l1_defense_app.c $(CFLAGS) $(LDFLAGS) -L. -lipc -lmem -o l1d_app
++ $(CC) ./test/fsl_dump_memory.c $(CFLAGS) $(LDFLAGS) -L. -lipc -lmem -o dump_mem
+
+ clean:
+ rm -rf dump_mem ipc_test ipc_test67 dsp_recover l1d_app ./lib/*.o *.a *.so
+--
+1.9.2
+
diff --git a/recipes-bsp/ipc/ipc.inc b/recipes-bsp/ipc/ipc.inc
index 73df6ce..ab44784 100644
--- a/recipes-bsp/ipc/ipc.inc
+++ b/recipes-bsp/ipc/ipc.inc
@@ -1,7 +1,8 @@
DEPENDS = "virtual/kernel"
-SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x \
+ file://Makefile-use-LDFLAGS-if-set.patch \
+"
SRCREV = "74d662707558290f070f9589177db730444bc435"
COMPATIBLE_MACHINE = "(bsc9132qds|bsc9131rdb|b4860qds|b4420qds)"
-