diff options
author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-06-14 14:38:18 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-07-11 13:35:10 +0800 |
commit | 639cc0b816cb2fe8941879bf311699e5febe6f77 (patch) | |
tree | f390906896f46b059704d2d12ab365565266cb17 /recipes-kernel/cryptodev/files | |
parent | b145a013cbbcdc11832d0d9c6a3a71a52d91a5c3 (diff) | |
download | meta-fsl-ppc-639cc0b816cb2fe8941879bf311699e5febe6f77.tar.gz |
cryptodev-linux/module: use fsl maintained source
FSL SDK released its own cryptodev based on 1.6, but not all the codes
was upstreamed, add bbappend to use fsl maintained source. This change
only be applied for fsl machines
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Ting Liu <b28495@freescale.com>
Diffstat (limited to 'recipes-kernel/cryptodev/files')
-rw-r--r-- | recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch | 69 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/files/makefile_fixup.patch | 26 |
2 files changed, 0 insertions, 95 deletions
diff --git a/recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch b/recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch deleted file mode 100644 index cb871f6..0000000 --- a/recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From 1980a8f4779a955e73285e7a0d86549b69bea5c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yu Zongchun <b40527@freescale.com> | ||
3 | Date: Sun, 28 Apr 2013 14:39:22 +0800 | ||
4 | Subject: [PATCH] Add the compile and install rules for cryptodev tests folder | ||
5 | |||
6 | This is required to install the cryptodev tests folder to rootfs | ||
7 | |||
8 | Signed-off-by: Yu Zongchun <b40527@freescale.com> | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | --- | ||
13 | Makefile | 6 ++++++ | ||
14 | tests/Makefile | 8 ++++++++ | ||
15 | 2 files changed, 14 insertions(+), 0 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile b/Makefile | ||
18 | index 2be8825..4cbb865 100644 | ||
19 | --- a/Makefile | ||
20 | +++ b/Makefile | ||
21 | @@ -17,6 +17,9 @@ install: | ||
22 | @echo "Installing cryptodev.h in /usr/include/crypto ..." | ||
23 | @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h | ||
24 | |||
25 | +install_tests: | ||
26 | + make -C tests install DESTDIR=$(PREFIX) | ||
27 | + | ||
28 | clean: | ||
29 | make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean | ||
30 | rm -f $(hostprogs) *~ | ||
31 | @@ -25,6 +28,9 @@ clean: | ||
32 | check: | ||
33 | KERNEL_DIR=$(KERNEL_DIR) make -C tests check | ||
34 | |||
35 | +testprogs: | ||
36 | + KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs | ||
37 | + | ||
38 | FILEBASE = cryptodev-linux-$(VERSION) | ||
39 | TMPDIR ?= /tmp | ||
40 | OUTPUT = $(FILEBASE).tar.gz | ||
41 | diff --git a/tests/Makefile b/tests/Makefile | ||
42 | index 87ca3c7..0488cf6 100644 | ||
43 | --- a/tests/Makefile | ||
44 | +++ b/tests/Makefile | ||
45 | @@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o | ||
46 | example-async-speed-objs := async_speed.o | ||
47 | example-hashcrypt-speed-objs := hashcrypt_speed.c | ||
48 | |||
49 | +install: | ||
50 | + install -d $(DESTDIR)/usr/bin/tests_cryptodev | ||
51 | + for bin in $(hostprogs); do \ | ||
52 | + install -m 755 $${bin} $(DESTDIR)/usr/bin/tests_cryptodev/; \ | ||
53 | + done | ||
54 | + | ||
55 | check: $(hostprogs) | ||
56 | ./cipher | ||
57 | ./hmac | ||
58 | @@ -28,6 +34,8 @@ check: $(hostprogs) | ||
59 | ./cipher-gcm | ||
60 | ./cipher-aead | ||
61 | |||
62 | +testprogs: $(hostprogs) | ||
63 | + | ||
64 | clean: | ||
65 | rm -f *.o *~ $(hostprogs) | ||
66 | |||
67 | -- | ||
68 | 1.7.5.4 | ||
69 | |||
diff --git a/recipes-kernel/cryptodev/files/makefile_fixup.patch b/recipes-kernel/cryptodev/files/makefile_fixup.patch deleted file mode 100644 index 323aacd..0000000 --- a/recipes-kernel/cryptodev/files/makefile_fixup.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | diff --git a/Makefile b/Makefile | ||
2 | index 2be8825..b36d68c 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -1,6 +1,7 @@ | ||
6 | KBUILD_CFLAGS += -I$(src) | ||
7 | KERNEL_DIR = /lib/modules/$(shell uname -r)/build | ||
8 | VERSION = 1.5 | ||
9 | +PREFIX = | ||
10 | |||
11 | cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o | ||
12 | |||
13 | @@ -12,10 +13,10 @@ build: version.h | ||
14 | version.h: Makefile | ||
15 | @echo "#define VERSION \"$(VERSION)\"" > version.h | ||
16 | |||
17 | -install: | ||
18 | +modules_install: | ||
19 | make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install | ||
20 | - @echo "Installing cryptodev.h in /usr/include/crypto ..." | ||
21 | - @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h | ||
22 | + @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..." | ||
23 | + @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h | ||
24 | |||
25 | clean: | ||
26 | make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean | ||