V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mkimage: Build signing only if board has CONFIG_FIT_SIGNATURE 

At present mkimage is set up to always build with image signing support.
This means that the SSL libraries (e.g. libssl-dev) are always required.

Adjust things so that mkimage can be built with and without image signing,
controlled by the presence of CONFIG_FIT_SIGNATURE in the board config file.

If CONFIG_FIT_SIGNATURE is not enabled, then mkimage will report a warning
that signing is not supported. If the option is enabled, but libraries are
not available, then a build error similar to this will be shown:

lib/rsa/rsa-sign.c:26:25: fatal error: openssl/rsa.h: No such file or directory

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2013-06-27 10:43:18 -07:00 committed by Tom Rini
parent 5ff0d0832e
commit 29ce737d6f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.mk
View File

@ -96,7 +96,6 @@ HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp")
HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
else else
HOSTCC = gcc HOSTCC = gcc
HOSTLIBS += -lssl -lcrypto
endif endif
ifeq ($(HOSTOS),cygwin) ifeq ($(HOSTOS),cygwin)
@ -211,6 +210,11 @@ CPPFLAGS += -ffunction-sections -fdata-sections
LDFLAGS_FINAL += --gc-sections LDFLAGS_FINAL += --gc-sections
endif endif
# TODO(sjg@chromium.org): Is this correct on Mac OS?
ifdef CONFIG_FIT_SIGNATURE
HOSTLIBS += -lssl -lcrypto
endif
ifneq ($(CONFIG_SYS_TEXT_BASE),) ifneq ($(CONFIG_SYS_TEXT_BASE),)
CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
endif endif

3
include/image.h
View File

@ -46,9 +46,6 @@ struct lmb;
#define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_LIBFDT 1
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
/* Support FIT image signing on host */
#define CONFIG_FIT_SIGNATURE
#define IMAGE_ENABLE_IGNORE 0 #define IMAGE_ENABLE_IGNORE 0
#define IMAGE_INDENT_STRING "" #define IMAGE_INDENT_STRING ""

2
tools/Makefile
View File

@ -126,7 +126,7 @@ LIBFDT_OBJ_FILES-y += fdt_strerror.o
LIBFDT_OBJ_FILES-y += fdt_wip.o LIBFDT_OBJ_FILES-y += fdt_wip.o
# RSA objects # RSA objects
RSA_OBJ_FILES-y += rsa-sign.o RSA_OBJ_FILES-$(CONFIG_FIT_SIGNATURE) += rsa-sign.o
# Generated LCD/video logo # Generated LCD/video logo
LOGO_H = $(OBJTREE)/include/bmp_logo.h LOGO_H = $(OBJTREE)/include/bmp_logo.h