Hi Uwe,
On Thu, Feb 21, 2019 at 11:25:30AM +0100, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> include/image-metadata.h | 4 ++++
> scripts/gen-dtb-s | 4 ++--
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/include/image-metadata.h b/include/image-metadata.h
> index 8739bffb92e1..5904d95acd37 100644
> --- a/include/image-metadata.h
> +++ b/include/image-metadata.h
> @@ -118,6 +118,10 @@ static inline void imd_used(const void *unused)
>
> #define IMD_USED(_name) \
> imd_used(&__barebox_imd_##_name)
> +#define IMD_USED_OF(_name) ({ \
> + extern char __barebox_imd_OF_ ## _name[]; \
> + imd_used(&__barebox_imd_OF_ ## _name); \
> + })
>
> #endif /* __BAREBOX__ */
>
> diff --git a/scripts/gen-dtb-s b/scripts/gen-dtb-s
> index 2b44ffb361eb..c3144df851bf 100755
> --- a/scripts/gen-dtb-s
> +++ b/scripts/gen-dtb-s
> @@ -18,8 +18,8 @@ FDTGET=scripts/dtc/fdtget
>
> if [ "$imd" = "y" ]; then
> echo ".section .barebox_imd_0.${name},\"a\""
> - echo ".global __imd_${name}_start"
> - echo "__imd_${name}_start:"
> + echo ".global __barebox_imd_OF_${name}"
> + echo "__barebox_imd_OF_${name}:"
This breaks somewhere when the compressed variants of the dtbs are used.
Building imx_v7_defconfig fails here with:
arch/arm/dts/built-in-pbl.o: In function `__dtb_z_imx6dl_wandboard_end':
arch/arm/dts/pbl-vf610-zii-ssmb-spu3.dtb.o:(.dtbz.rodata.imx6dl_wandboard+0x2340): undefined reference to `__imd_imx6dl_wandboard_start'
OBJCOPYB images/start_imx6dl_nitrogen6x_1g.pblb
arch/arm/dts/built-in-pbl.o: In function `__dtb_z_imx6q_wandboard_end':
arch/arm/dts/pbl-vf610-zii-ssmb-spu3.dtb.o:(.dtbz.rodata.imx6q_wandboard+0x2320): undefined reference to `__imd_imx6q_wandboard_start'
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
