From 653c7b53dd8b9c6f5519fae1b4bc3c54fb2f94e9 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Tue, 14 Jun 2016 11:56:57 +0800 Subject: usdpaa-apps: update to 835cbce Changelog: 835cbce classifier_demo: Fix IPv4 table entry removal on LE platforms 2806cdc classifier_demo: Replace obsolete platform flags with FMan version flags aca81f7 classifier_demo: Avoid using compile time symbols abae100 IPSECFWD:Using correct SEC ERA version check for split key generation 5d8452a IPSECFWD: RTA changes for Authentication Key d314b64 USDPAA-APPS: Ipsecfwd for ls1043 for sdk2.0 b3b078b ipsec_offload: Add debug tools 424fcbe reassembly_demo: Add support for running on LS1043A ee4a5d2 fragmentation_demo: Add support for running on LS1043A 1dc24e8 classifier_demo: Add support for running on LS1043A d3928a6 simple_crypto: remove unused variable 57131aa ls1043_config: Adding config for ls1043 fmc. 3cc1bbc USDPAA-APPS:reflector,ipfwd and lpm-ipfwd support for LS1043 e47d4d2 USDPAA-APPS support for LS1043(makefile and standalone-env) 9cd4030 libfslcrypto: enable apps compilation in out-of-tree mode 2c57883 simple_proto: fix AEAD descriptor creation function order of parameters 42f4d02 ipsecfwd: sync with FLIB f80d93b simple_proto: add endianness support for protocols 9228309 simple_proto: fix IPSec test vector 028e14e libfslcrypto: workaround for CPU frequency 98d949e simple_crypto: fix SNOW_F8_F9 processing 23ce7f6 qman, libfslcrypto: export SG transformation functions 75a2010 simple_crypto: add swap option for block cipher descriptors 146c4e1 simple_crypto: fix endianness for preheader 8800996 libfslcrypto: support for dumping extended SG entries 49dd54f libfslcrypto: fix comparison for results < 4B b54325f libfslcrypto: fix SGT handling endianness 97d3eb5 libfslcrypto: fix preheader bitfields c5c35f8 Revert "ipsecfwd, simple_proto, simple_crypto: sync with FLIB" 07ed016 Revert "libfslcrypto: support for dumping extended SG entries" 2c9cd79 ipsecfwd, simple_proto, simple_crypto: sync with FLIB 126a441 ipsecfwd, simple_proto: flib sync - IPsec - fix PDB endianness 5493443 fix the inline function definition with gcc 5.x 9e08876 xfrm_km.c: use in6_* macros from glibc instead of kernel Signed-off-by: Marian Chereji Signed-off-by: Ting Liu --- ...e-inline-function-definition-with-gcc-5.x.patch | 80 ---------------------- ...se-in6_-macros-from-glibc-instead-of-kern.patch | 49 ------------- .../recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb | 22 +++--- 3 files changed, 9 insertions(+), 142 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/fix-the-inline-function-definition-with-gcc-5.x.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/xfrm_km.c-use-in6_-macros-from-glibc-instead-of-kern.patch (limited to 'dynamic-layers/openembedded-layer') diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/fix-the-inline-function-definition-with-gcc-5.x.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/fix-the-inline-function-definition-with-gcc-5.x.patch deleted file mode 100644 index 9f3d22cc..00000000 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/fix-the-inline-function-definition-with-gcc-5.x.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 2b308217d2811e5d1420d7ce6e18f77a992f52e9 Mon Sep 17 00:00:00 2001 -From: Ting Liu -Date: Tue, 22 Dec 2015 13:16:33 +0800 -Subject: [PATCH] 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: -| dpa_classif_demo.c:(.text+0xeae): undefined reference to `crc64_hash_function' -| simple_crypto.c:(.text+0x5b8e): undefined reference to `get_num_of_buffers' -| simple_crypto.c:(.text+0x5b9a): undefined reference to `get_test_mode' -| simple_crypto.c:(.text+0x5baa): undefined reference to `get_num_of_cpus' -| simple_crypto.c:(.text+0x5bb2): undefined reference to `requires_authentication' -| simple_crypto.c:(.text+0x5bbe): undefined reference to `get_thread_barrier' - -Upstream-Status: Pending - -Signed-off-by: Ting Liu ---- - lib/hash_table/fman_crc64_hash_func.h | 2 +- - src/simple_crypto/include/simple_crypto.h | 10 +++++----- - src/simple_proto/include/simple_proto.h | 10 +++++----- - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lib/hash_table/fman_crc64_hash_func.h b/lib/hash_table/fman_crc64_hash_func.h -index 5095203..bdcf12b 100644 ---- a/lib/hash_table/fman_crc64_hash_func.h -+++ b/lib/hash_table/fman_crc64_hash_func.h -@@ -36,7 +36,7 @@ - #include - - /* Hash function used by the hash table based on FMan CRC64 */ --inline uint32_t crc64_hash_function(uint8_t *key, uint32_t size) -+static inline uint32_t crc64_hash_function(uint8_t *key, uint32_t size) - { - uint64_t hashval = 0; - hashval = fman_crc64_init(); -diff --git a/src/simple_crypto/include/simple_crypto.h b/src/simple_crypto/include/simple_crypto.h -index bae3460..46ea176 100644 ---- a/src/simple_crypto/include/simple_crypto.h -+++ b/src/simple_crypto/include/simple_crypto.h -@@ -123,10 +123,10 @@ static int validate_test_set(struct test_param crypto_info); - void set_crypto_cbs(struct test_cb *crypto_cb, struct test_param crypto_info); - inline int get_num_of_iterations(void *stuff); - void set_num_of_iterations(void *stuff, unsigned int itr_num); --inline int get_num_of_buffers(void *stuff); --inline enum test_mode get_test_mode(void *stuff); --inline uint8_t requires_authentication(void *); --inline long get_num_of_cpus(void); --inline pthread_barrier_t *get_thread_barrier(void); -+static inline int get_num_of_buffers(void *stuff); -+static inline enum test_mode get_test_mode(void *stuff); -+static inline uint8_t requires_authentication(void *); -+static inline long get_num_of_cpus(void); -+static inline pthread_barrier_t *get_thread_barrier(void); - - #endif /* __SIMPLE_CRYPTO_H */ -diff --git a/src/simple_proto/include/simple_proto.h b/src/simple_proto/include/simple_proto.h -index d413e70..ce0e842 100644 ---- a/src/simple_proto/include/simple_proto.h -+++ b/src/simple_proto/include/simple_proto.h -@@ -83,11 +83,11 @@ struct protocol_info *(*register_protocol[])(void) = { - static void set_crypto_cbs(struct test_cb *crypto_cb); - int get_num_of_iterations(void *params); - void set_num_of_iterations(void *params, unsigned int itr_num); --inline int get_num_of_buffers(void *params); --inline enum test_mode get_test_mode(void *params); --inline uint8_t requires_authentication(void *); --inline long get_num_of_cpus(void); --inline pthread_barrier_t *get_thread_barrier(void); -+static inline int get_num_of_buffers(void *params); -+static inline enum test_mode get_test_mode(void *params); -+static inline uint8_t requires_authentication(void *); -+static inline long get_num_of_cpus(void); -+static inline pthread_barrier_t *get_thread_barrier(void); - int register_modules(void); - void unregister_modules(void); - --- -1.9.2 - diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/xfrm_km.c-use-in6_-macros-from-glibc-instead-of-kern.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/xfrm_km.c-use-in6_-macros-from-glibc-instead-of-kern.patch deleted file mode 100644 index c6d35f00..00000000 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps/xfrm_km.c-use-in6_-macros-from-glibc-instead-of-kern.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1e1e8d74db98faed57a5a62788e1226801661e0e Mon Sep 17 00:00:00 2001 -From: Ting Liu -Date: Tue, 22 Dec 2015 23:37:49 +0800 -Subject: [PATCH] xfrm_km.c: use in6_* macros from glibc instead of kernel - -Both glibc and the kernel have in6_* macros definition. Use the one from glibc. -Kernel headers will check for previous libc definitions by including -include/linux/libc-compat.h. - -Fix the below build error: -| [CC] xfrm_km.c (bin:srio_ipsec_offload) -| In file included from .../tmp/sysroots/b4860qds-64b/usr/include/linux/xfrm.h:4:0, -| from src/srio_ipsec_offload/xfrm_km.c:46: -| .../usr/include/netinet/in.h:99:5: error: expected identifier before numeric constant -| IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */ -| ^ -| In file included from .../tmp/sysroots/b4860qds-64b/usr/include/netinet/ip.h:24:0, -| from src/srio_ipsec_offload/xfrm_km.c:52: -| .../tmp/sysroots/b4860qds-64b/usr/include/netinet/in.h:209:8: error: redefinition of 'struct in6_addr' -| struct in6_addr -| ^ -| In file included from .../tmp/sysroots/b4860qds-64b/usr/include/linux/xfrm.h:4:0, -| from src/srio_ipsec_offload/xfrm_km.c:46: -| .../tmp/sysroots/b4860qds-64b/usr/include/linux/in6.h:32:8: note: originally defined here -| struct in6_addr { -| ^ - -Upstream-Status: Pending - -Signed-off-by: Ting Liu ---- - src/srio_ipsec_offload/xfrm_km.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/srio_ipsec_offload/xfrm_km.c b/src/srio_ipsec_offload/xfrm_km.c -index df23fd1..d69aafa 100644 ---- a/src/srio_ipsec_offload/xfrm_km.c -+++ b/src/srio_ipsec_offload/xfrm_km.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -1.9.2 - diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb index 1a19d1e8..d9673128 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb @@ -14,30 +14,28 @@ RDEPENDS_${PN} = "libgcc bash" RDEPENDS_${PN}_append_b4860qds = " ipc-ust" RDEPENDS_${PN}_append_b4420qds = " ipc-ust" -SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa/usdpaa-apps.git;branch=sdk-v1.9.x \ - file://fix-the-inline-function-definition-with-gcc-5.x.patch \ - file://xfrm_km.c-use-in6_-macros-from-glibc-instead-of-kern.patch \ -" -SRCREV = "1d9418af04990289bec72cd43a9385690523fcdb" +SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa/usdpaa-apps.git;branch=sdk-v2.0.x" +SRCREV = "835cbceb4f76de1b493fea5dbe43a90f516b6f35" S = "${WORKDIR}/git" -EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" AR="${AR}"' -export ARCH="${TARGET_ARCH}" +WRAP_ARCH ?= "${TARGET_ARCH}" +WRAP_ARCH_ls1043ardb = "arm64" +EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" AR="${AR}" ARCH="${WRAP_ARCH}"' SOC ?= "P4080" SOC_b4 = "B4860" SOC_t1 = "T1040" SOC_t2 = "T2080" SOC_t4 = "T4240" -SOC_p1023rdb = "P1023" +SOC_ls1043ardb = "LS1043" FMAN_VARIANT ?= "P4080" FMAN_VARIANT_b4 = "FMAN_V3H" FMAN_VARIANT_t1 = "FMAN_V3L" FMAN_VARIANT_t2 = "FMAN_V3H" FMAN_VARIANT_t4 = "FMAN_V3H" -FMAN_VARIANT_p1023rdb = "P1023" +FMAN_VARIANT_ls1043ardb = "LS1043" do_compile_prepend () { export SOC=${SOC} @@ -58,11 +56,9 @@ do_compile_prepend () { do_install () { export SOC=${SOC} - oe_runmake install DESTDIR=${D} + oe_runmake install LIBDIR=${BASELIB} DESTDIR=${D} } PARALLEL_MAKE_pn-${PN} = "" FILES_${PN} += "/root/SOURCE_THIS /usr/etc/" - -COMPATIBLE_HOST_qoriq-ppc = ".*" -COMPATIBLE_HOST ?= "(none)" +COMPATIBLE_MACHINE = "(qoriq-ppc|ls1043a)" -- cgit v1.2.3-54-g00ecf