Re: [ptxdist] [APPLIED] barebox: add integration of firmware blobs

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 6684c552fbd7d96842dcf489647648718a076c1b.

Michael

[sent from post-receive hook]

On Sun, 30 Jan 2022 16:49:49 +0100, Michael Riesch <michael.riesch@wolfvision.net> wrote:
> In some cases barebox requires firmware blobs, which may be
> provided in binary form by the vendor or compiled in a
> preceding step. Add the possibility to specify files (in
> separate rule files) which are injected in the barebox source
> directory during preparation.
> 
> The virtual symbol BAREBOX_DEPENDENCIES is introduced in this
> patch to allow for the addition of dependencies on e.g.,
> firmware packages.
> 
> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
> Message-Id: <20220129070330.2601433-5-michael.riesch@wolfvision.net>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/barebox.firmware.in b/platforms/barebox.firmware.in
> new file mode 100644
> index 000000000000..c7275e6d3469
> --- /dev/null
> +++ b/platforms/barebox.firmware.in
> @@ -0,0 +1,7 @@
> +## SECTION=barebox_firmware
> +
> +#
> +# This file does only exist to create a defined entry in the "barebox_firmware"
> +# section, so that the toplevel Kconfig can include generated/barebox_firmware.in
> +# even if no package is in that category.
> +#
> diff --git a/platforms/barebox.in b/platforms/barebox.in
> index d35d165011b9..245b272a31da 100644
> --- a/platforms/barebox.in
> +++ b/platforms/barebox.in
> @@ -8,7 +8,12 @@ config BAREBOX_ARCH_STRING
>  	default "ppc"			if ARCH_PPC
>  	default "x86"			if ARCH_X86
>  
> +config BAREBOX_DEPENDENCIES
> +	tristate
> +	select VIRTUAL
> +
>  menuconfig BAREBOX
> +	select BAREBOX_DEPENDENCIES
>  	select BOOTLOADER
>  	select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB
>  	select HOST_OPENSSL if BAREBOX_NEEDS_HOST_OPENSSL
> @@ -55,6 +60,14 @@ config BAREBOX_CONFIG
>  	  This entry specifies the .config file used to compile
>  	  barebox.
>  
> +menuconfig BAREBOX_FIRMWARE
> +	bool
> +	prompt "integrate firmware blobs      "
> +
> +if BAREBOX_FIRMWARE
> +source "generated/barebox_firmware.in"
> +endif
> +
>  config BAREBOX_EXTRA_ENV
>  	prompt "extend the builtin barebox environment"
>  	bool
> diff --git a/rules/barebox.make b/rules/barebox.make
> index bea9f3adcbf8..1c8463e637c2 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -34,6 +34,8 @@ BAREBOX_CONFIG		:= $(call ptx/in-platformconfigdir, \
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> +BAREBOX_INJECT_PATH	:= ${PTXDIST_SYSROOT_TARGET}/usr/lib/firmware
> +
>  # use host pkg-config for host tools
>  BAREBOX_PATH		:= PATH=$(HOST_PATH)
>  
> @@ -94,6 +96,10 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV
>  	@rm -rf $(BAREBOX_BUILD_DIR)/defaultenv/barebox_default_env
>  endif
>  
> +ifdef PTXCONF_BAREBOX_FIRMWARE
> +	@$(call world/inject, BAREBOX)
> +endif
> +
>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de