Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 415efc9358f68d99f28f13683eda3a8289e38a91

Authored by Clemens Gruber
Committed by Ye Li
1 parent 4fc2bd5625
Exists in smarc-imx_v2017.03_o8.1.0_1.3.0_8m and in 1 other branch smarc-imx_v2017.03_4.9.88_2.0.0_ga

crypto/fsl: fix obj-yy in Makefile 

When enabling CONFIG_CMD_BLOB and/or CONFIG_CMD_DEKBLOB, the build fails
with a linker error:
  ...
  LD      u-boot
arch/arm/mach-imx/built-in.o: In function `blob_encap_dek':
/home/clemens/dev/u-boot/arch/arm/mach-imx/cmd_dek.c:46: undefined
reference to `blob_dek'

This is due to an error in the Makefile, resulting in obj-yy/obj-yn/..
and fsl_blob.o is therefore not linked.

Fix it by splitting it up into two obj-y lines.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
[Breno: Backported to v2017.03]
Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

(cherry picked from commit e62c55b64fa81236caf9adaa9737de2f2c4777e3)

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/crypto/fsl/Makefile
Diff comments   View file @ 415efc9
... ... @@ -6,7 +6,8 @@
6 6  
7 7 obj-y += sec.o
8 8 obj-$(CONFIG_FSL_CAAM) += jr.o fsl_hash.o jobdesc.o error.o
9   -obj-$(CONFIG_CMD_BLOB)$(CONFIG_CMD_DEKBLOB) += fsl_blob.o
  9 +obj-$(CONFIG_CMD_BLOB) += fsl_blob.o
  10 +obj-$(CONFIG_CMD_DEKBLOB) += fsl_blob.o
10 11 obj-$(CONFIG_RSA_FREESCALE_EXP) += fsl_rsa.o
11 12 obj-$(CONFIG_FSL_MFGPROT) += fsl_mfgprot.o