Re: [DistroKit] [PATCH 7/9] platform: v8a: firmware-rockchip: Move barebox injects to separate package

[Robert Schwebel <r.schwebel@pengutronix.de>]

Also dropped

On Thu, Apr 25, 2024 at 10:03:00AM +0200, Alexander Dahl wrote:
> This is what 'barebox_firmware' was invented for.  Done to avoid
> cluttering the firmware-rockchip package with bootloader specific stuff.
> 
> Approach inspired by the patch series which introduced that
> infrastructure in ptxdist.  Same as with firmware-imx package.
> 
> Link: https://lore.ptxdist.org/ptxdist/20220129070330.2601433-6-michael.riesch@wolfvision.net/
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  configs/platform-v8a/platformconfig           |  1 +
>  .../platforms/barebox.rockchip.in             | 14 +++++++++++++
>  .../platforms/firmware-rockchip.in            |  5 -----
>  .../platform-v8a/rules/barebox.rockchip.make  | 20 +++++++++++++++++++
>  .../platform-v8a/rules/firmware-rockchip.make | 10 ----------
>  5 files changed, 35 insertions(+), 15 deletions(-)
>  create mode 100644 configs/platform-v8a/platforms/barebox.rockchip.in
> 
> diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
> index ba33191..342aa11 100644
> --- a/configs/platform-v8a/platformconfig
> +++ b/configs/platform-v8a/platformconfig
> @@ -184,6 +184,7 @@ PTXCONF_BAREBOX_MD5="dcb443c48b64662b52974502c502427e"
>  PTXCONF_BAREBOX_CONFIG="barebox.config"
>  PTXCONF_BAREBOX_FIRMWARE=y
>  PTXCONF_BAREBOX_NEEDS_FIRMWARE_IMX=y
> +PTXCONF_BAREBOX_NEEDS_FIRMWARE_ROCKCHIP=y
>  PTXCONF_BAREBOX_EXTRA_ENV=y
>  PTXCONF_BAREBOX_EXTRA_ENV_PATH="barebox-common-defaultenv"
>  # PTXCONF_BAREBOX_BAREBOXENV is not set
> diff --git a/configs/platform-v8a/platforms/barebox.rockchip.in b/configs/platform-v8a/platforms/barebox.rockchip.in
> new file mode 100644
> index 0000000..3291085
> --- /dev/null
> +++ b/configs/platform-v8a/platforms/barebox.rockchip.in
> @@ -0,0 +1,14 @@
> +## SECTION=barebox_firmware
> +
> +config BAREBOX_NEEDS_FIRMWARE_ROCKCHIP
> +	bool
> +	prompt "barebox needs firmware-rockchip"
> +	help
> +	  Select this if barebox needs the non-free Rockchip firmware blobs.
> +
> +config BAREBOX_DEPENDENCIES
> +	tristate
> +	select FIRMWARE_ROCKCHIP if BAREBOX_NEEDS_FIRMWARE_ROCKCHIP
> +	select FIRMWARE_ROCKCHIP_RK3568_SDRAM if BAREBOX_NEEDS_FIRMWARE_ROCKCHIP
> +	select FIRMWARE_ROCKCHIP_RK356x_BL31 if BAREBOX_NEEDS_FIRMWARE_ROCKCHIP
> +	select FIRMWARE_ROCKCHIP_RK356x_BL32 if BAREBOX_NEEDS_FIRMWARE_ROCKCHIP
> diff --git a/configs/platform-v8a/platforms/firmware-rockchip.in b/configs/platform-v8a/platforms/firmware-rockchip.in
> index 87a1490..aa70241 100644
> --- a/configs/platform-v8a/platforms/firmware-rockchip.in
> +++ b/configs/platform-v8a/platforms/firmware-rockchip.in
> @@ -39,8 +39,3 @@ config FIRMWARE_ROCKCHIP_RK356x_BL32
>  	  and the Rockchip RK3568 EVB1 board.
>  
>  endif
> -
> -config BAREBOX_DEPENDENCIES
> -	tristate
> -	select FIRMWARE_ROCKCHIP
> -
> diff --git a/configs/platform-v8a/rules/barebox.rockchip.make b/configs/platform-v8a/rules/barebox.rockchip.make
> index 17092a9..fad39c9 100644
> --- a/configs/platform-v8a/rules/barebox.rockchip.make
> +++ b/configs/platform-v8a/rules/barebox.rockchip.make
> @@ -9,4 +9,24 @@
>  # TODO: remove this when it is added in PTXdist upstream
>  BAREBOX_PROGS_HOST += rk-usb-loader
>  
> +#
> +# Firmware blobs for barebox
> +#
> +ifdef PTXCONF_FIRMWARE_ROCKCHIP
> +
> +ifdef PTXCONF_FIRMWARE_ROCKCHIP_RK356x_BL31
> +BAREBOX_INJECT_FILES += rk3568_bl31_v1.24.elf:firmware/rk3568-bl31.bin
> +endif
> +
> +ifdef PTXCONF_FIRMWARE_ROCKCHIP_RK356x_BL32
> +BAREBOX_INJECT_FILES += rk3568_bl32_v1.05.bin:firmware/rk3568-op-tee.bin
> +endif
> +
> +ifdef PTXCONF_FIRMWARE_ROCKCHIP_RK3568_SDRAM
> +BAREBOX_INJECT_FILES += rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/rockchip-rk3568-evb/sdram-init.bin
> +BAREBOX_INJECT_FILES += rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/radxa-rock3/sdram-init.bin
> +endif
> +
> +endif
> +
>  # vim: syntax=make
> diff --git a/configs/platform-v8a/rules/firmware-rockchip.make b/configs/platform-v8a/rules/firmware-rockchip.make
> index 6949148..dd50c86 100644
> --- a/configs/platform-v8a/rules/firmware-rockchip.make
> +++ b/configs/platform-v8a/rules/firmware-rockchip.make
> @@ -20,16 +20,6 @@ FIRMWARE_ROCKCHIP_SOURCE	:= $(SRCDIR)/$(FIRMWARE_ROCKCHIP).$(FIRMWARE_ROCKCHIP_S
>  FIRMWARE_ROCKCHIP_DIR		:= $(BUILDDIR)/$(FIRMWARE_ROCKCHIP)
>  FIRMWARE_ROCKCHIP_LICENSE	:= proprietary
>  
> -#
> -# Firmware blobs for barebox
> -#
> -ifdef PTXCONF_FIRMWARE_ROCKCHIP
> -BAREBOX_INJECT_FILES		+= rk3568_bl31_v1.24.elf:firmware/rk3568-bl31.bin
> -BAREBOX_INJECT_FILES		+= rk3568_bl32_v1.05.bin:firmware/rk3568-op-tee.bin
> -BAREBOX_INJECT_FILES		+= rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/rockchip-rk3568-evb/sdram-init.bin
> -BAREBOX_INJECT_FILES		+= rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/radxa-rock3/sdram-init.bin
> -endif
> -
>  # ----------------------------------------------------------------------------
>  # Prepare
>  # ----------------------------------------------------------------------------
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |