Message ID | 20170903171710.27708-1-clemens.gruber@pqgruber.com |
---|---|
State | Accepted |
Commit | 4c2cf973aa109844532775adeb1dec358280c217 |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot] crypto/fsl: fix obj-yy in Makefile | expand |
On Sun, Sep 3, 2017 at 2:17 PM, Clemens Gruber <clemens.gruber@pqgruber.com> wrote: > 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>
On Sun, Sep 03, 2017 at 07:17:10PM +0200, Clemens Gruber wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/drivers/crypto/fsl/Makefile b/drivers/crypto/fsl/Makefile index fd736cf3be..ea878e1822 100644 --- a/drivers/crypto/fsl/Makefile +++ b/drivers/crypto/fsl/Makefile @@ -6,5 +6,6 @@ obj-y += sec.o obj-$(CONFIG_FSL_CAAM) += jr.o fsl_hash.o jobdesc.o error.o -obj-$(CONFIG_CMD_BLOB)$(CONFIG_CMD_DEKBLOB) += fsl_blob.o +obj-$(CONFIG_CMD_BLOB) += fsl_blob.o +obj-$(CONFIG_CMD_DEKBLOB) += fsl_blob.o obj-$(CONFIG_RSA_FREESCALE_EXP) += fsl_rsa.o
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> --- drivers/crypto/fsl/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)