ext: move tinycrypt to ext/lib

Tinycrypt is maintained at github and thus should be treated as an
external library and hosted under ext/.

Change-Id: I4c4a3bcdacf01d4922919e5ea1f9dec21a19cd37
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-05-28 14:41:55 -04:00
commit 7d76e9619b
48 changed files with 51 additions and 18 deletions

View file

@ -80,6 +80,11 @@ M: Anas Nashif <anas.nashif@intel.com>
S: Supported S: Supported
F: ext/hal/qmsi/ F: ext/hal/qmsi/
TINYCRYPT
M: Constanza Heath <constanza.m.heath@intel.com>
S: Supported
F: ext/lib/crypto/tinycrypt
THE REST THE REST
M: Anas Nashif <anas.nashif@intel.com> M: Anas Nashif <anas.nashif@intel.com>
L: devel@lists.zephyrproject.com L: devel@lists.zephyrproject.com

View file

@ -101,7 +101,7 @@ INPUT = \
include/ \ include/ \
include/misc/ \ include/misc/ \
lib/libc/minimal/include/ \ lib/libc/minimal/include/ \
lib/crypto/tinycrypt/include/ ext/lib/crypto/tinycrypt/include/
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
FILE_PATTERNS = "*.c" "*.h" "*.S" FILE_PATTERNS = "*.c" "*.h" "*.S"
RECURSIVE = YES RECURSIVE = YES

View file

@ -1 +1,2 @@
obj-y += hal/ obj-y += hal/
obj-y += lib/

View file

@ -20,4 +20,6 @@ menu "External Sources"
source "ext/hal/Kconfig" source "ext/hal/Kconfig"
source "ext/lib/crypto/Kconfig"
endmenu endmenu

View file

@ -1,3 +1,2 @@
include $(srctree)/ext/lib/Makefile
include $(srctree)/ext/hal/Makefile include $(srctree)/ext/hal/Makefile

1
ext/lib/Kbuild Normal file
View file

@ -0,0 +1 @@
obj-y += crypto/

4
ext/lib/Makefile Normal file
View file

@ -0,0 +1,4 @@
ifdef CONFIG_TINYCRYPT
ZEPHYRINCLUDE += -I$(srctree)/ext/lib/crypto/tinycrypt/include
endif

21
ext/lib/crypto/Kconfig Normal file
View file

@ -0,0 +1,21 @@
#
# Copyright (c) 2016 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
menu "Cryptography"
source "ext/lib/crypto/tinycrypt/Kconfig"
endmenu

View file

@ -1,4 +1,4 @@
subdir-ccflags-y +=-I$(srctree)/lib/crypto/tinycrypt/include subdir-ccflags-y +=-I$(srctree)/ext/lib/crypto/tinycrypt/include
obj-$(CONFIG_TINYCRYPT) := source/utils.o obj-$(CONFIG_TINYCRYPT) := source/utils.o
obj-$(CONFIG_TINYCRYPT_ECC_DH) += source/ecc_dh.o source/ecc.o obj-$(CONFIG_TINYCRYPT_ECC_DH) += source/ecc_dh.o source/ecc.o

View file

@ -1,2 +1 @@
obj-y += libc/ obj-y += libc/
obj-y += crypto/

View file

@ -1,8 +1,3 @@
ifdef CONFIG_TINYCRYPT
ZEPHYRINCLUDE += -I$(srctree)/lib/crypto/tinycrypt/include
endif
ifdef CONFIG_MINIMAL_LIBC ifdef CONFIG_MINIMAL_LIBC
ZEPHYRINCLUDE += -I$(srctree)/lib/libc/minimal/include ZEPHYRINCLUDE += -I$(srctree)/lib/libc/minimal/include
endif endif

View file

@ -1,2 +1,2 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_aes.o obj-y = test_aes.o

View file

@ -1,2 +1,3 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_cbc_mode.o obj-y = test_cbc_mode.o

View file

@ -1,2 +1,3 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_ccm_mode.o obj-y = test_ccm_mode.o

View file

@ -1,2 +1,3 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_cmac_mode.o obj-y = test_cmac_mode.o

View file

@ -1,2 +1,2 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_ctr_mode.o obj-y = test_ctr_mode.o

View file

@ -1,2 +1,3 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_hmac.o obj-y = test_hmac.o

View file

@ -1,3 +1,4 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_hmac_prng.o obj-y = test_hmac_prng.o

View file

@ -1,3 +1,4 @@
ccflags-y += -I$(srctree)/tests/include -I$(srctree)/lib/crypto/tinycrypt/include ccflags-y += -I$(srctree)/tests/include
obj-y = test_sha256.o obj-y = test_sha256.o