[Buildroot] [PATCH v6 0/3] Add board support for Radxa Rock 5B

[Buildroot] [PATCH v6 0/3] Add board support for Radxa Rock 5B

[Kilian Zinnecker via buildroot]

This patch series adds support for the Radxa Rock 5B board, featuring
the Rockchip RK3588 SoC. It adds a package for the Rockchip ATF binary
blobs, needed by U-Boot. It uses a modified Linux kernel from Radxa.
After build, a fit image with compressed kernel is generated, which is
then put into an SD card image alongside U-Boot and the root file
system.

v5 -> v6:

  - Bumps uboot version: now uses 2023.7 instead of release candidate
  - Fixes dependency error in uboot.mk
  - Improves rockchip-rkbin.mk: can now handle different rockchip blob
    file type extensions
  - Improves uboot.mk: can now handle different rockchip blob file
    type extensions
  - Improves rockchip-rkbin.mk: improved menuconfig menu
  - Improves post-image.sh: now automatically copies u-boot to
    BINARIES_DIR through uboot.mk
  - Improves genimage.cfg: removes unnecessary partition offsets
  - Improves boot command handling: now uses uboot.cmd instead of
    uboot fragment file


Kilian Zinnecker (3):
  package: add rockchip-rkbin package
  configs: add rock5b/rock5b_defconfig
  board/radxa/rock5b: Add sdcard image scripts

 DEVELOPERS                                 |  5 ++
 board/radxa/rock5b/boot.cmd                |  3 +
 board/radxa/rock5b/genimage.cfg            | 34 +++++++++++
 board/radxa/rock5b/linux.fragment          |  1 +
 board/radxa/rock5b/post-image.sh           | 20 +++++++
 board/radxa/rock5b/readme.txt              | 62 +++++++++++++++++++
 board/radxa/rock5b/rock5b.its              | 46 ++++++++++++++
 boot/uboot/Config.in                       |  9 +++
 boot/uboot/uboot.mk                        | 17 ++++++
 configs/rock5b_defconfig                   | 49 +++++++++++++++
 package/Config.in                          |  1 +
 package/rockchip-rkbin/Config.in           | 70 ++++++++++++++++++++++
 package/rockchip-rkbin/rockchip-rkbin.hash |  3 +
 package/rockchip-rkbin/rockchip-rkbin.mk   | 49 +++++++++++++++
 14 files changed, 369 insertions(+)
 create mode 100644 board/radxa/rock5b/boot.cmd
 create mode 100644 board/radxa/rock5b/genimage.cfg
 create mode 100644 board/radxa/rock5b/linux.fragment
 create mode 100755 board/radxa/rock5b/post-image.sh
 create mode 100644 board/radxa/rock5b/readme.txt
 create mode 100644 board/radxa/rock5b/rock5b.its
 create mode 100644 configs/rock5b_defconfig
 create mode 100644 package/rockchip-rkbin/Config.in
 create mode 100644 package/rockchip-rkbin/rockchip-rkbin.hash
 create mode 100644 package/rockchip-rkbin/rockchip-rkbin.mk

-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v6 1/3] package: add rockchip-rkbin package

[Kilian Zinnecker via buildroot]

This patch adds a package for the Rockchip ATF binary blobs. These
binaries are needed to build U-Boot for some Rockchip SoCs (e.g.,
RK3588). One can config a custom version and manually define which
blobs (for bl31, tpl and tee) to use from the repository. The
U-Boot package is modified so that it takes the chosen binaries and
uses them during build.

Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>
---
 DEVELOPERS                                 |  3 +
 boot/uboot/Config.in                       |  9 +++
 boot/uboot/uboot.mk                        | 17 ++++++
 package/Config.in                          |  1 +
 package/rockchip-rkbin/Config.in           | 70 ++++++++++++++++++++++
 package/rockchip-rkbin/rockchip-rkbin.hash |  3 +
 package/rockchip-rkbin/rockchip-rkbin.mk   | 49 +++++++++++++++
 7 files changed, 152 insertions(+)
 create mode 100644 package/rockchip-rkbin/Config.in
 create mode 100644 package/rockchip-rkbin/rockchip-rkbin.hash
 create mode 100644 package/rockchip-rkbin/rockchip-rkbin.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index abea0bbb86..f6f474967a 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1790,6 +1790,9 @@ F:	package/ramsmp/
 N:	Kieran Bingham <kieran.bingham@ideasonboard.com>
 F:	package/libcamera/
 
+N:	Kilian Zinnecker <kilian.zinnecker@mail.de>
+F:	package/rockchip-rkbin/
+
 N:	Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
 F:	package/wqy-zenhei/
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 085397d03d..7733f8501f 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -262,6 +262,15 @@ config BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE
 	  This option makes sure that the i.MX firmwares are copied into
 	  the U-Boot source directory.
 
+config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN
+	bool "U-Boot needs rockchip-rkbin"
+	depends on BR2_PACKAGE_ROCKCHIP_RKBIN
+	help
+	  For some Rockchip SoCs U-Boot needs binary blobs from
+	  Rockchip.
+	  This option makes sure that the needed binary blobs are copied
+	  into the U-Boot source directory.
+
 menu "U-Boot binary format"
 
 config BR2_TARGET_UBOOT_FORMAT_AIS
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 4eae8e95c3..f9f50539e5 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -207,6 +207,23 @@ endef
 UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_IMX_FW_FILES
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN),y)
+UBOOT_DEPENDENCIES += rockchip-rkbin
+define UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN
+	$(INSTALL) -D -m 0644 $(@D)/u-boot-rockchip.bin $(BINARIES_DIR)/
+endef
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE),y)
+UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31${suffix $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))}
+endif
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE),y)
+UBOOT_MAKE_OPTS += ROCKCHIP_TPL=$(BINARIES_DIR)/ddr${suffix $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))}
+endif
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),y)
+$BOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee${suffix $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))}
+endif
+endif
+
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
 UBOOT_DEPENDENCIES += host-dtc
 endif
diff --git a/package/Config.in b/package/Config.in
index 3a7466d575..1aa7d299a9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -581,6 +581,7 @@ endmenu
 	source "package/read-edid/Config.in"
 	source "package/rng-tools/Config.in"
 	source "package/rockchip-mali/Config.in"
+	source "package/rockchip-rkbin/Config.in"
 	source "package/rpi-userland/Config.in"
 	source "package/rs485conf/Config.in"
 	source "package/rtc-tools/Config.in"
diff --git a/package/rockchip-rkbin/Config.in b/package/rockchip-rkbin/Config.in
new file mode 100644
index 0000000000..0f2126654e
--- /dev/null
+++ b/package/rockchip-rkbin/Config.in
@@ -0,0 +1,70 @@
+config BR2_PACKAGE_ROCKCHIP_RKBIN
+	bool "Rockchip rkbin binary blobs"
+	depends on BR2_arm || BR2_aarch64
+	help
+	  This package provides Rockchip SoC binary blobs for U-Boot.
+
+if BR2_PACKAGE_ROCKCHIP_RKBIN
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
+	bool "Use a custom version"
+	help
+	  This option allows to use a specific version.
+if BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE
+	string "Rockchip rkbin version"
+	depends on BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
+
+endif # BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_VERSION
+	string
+	default "d6ccfe401ca84a98ca3b85c12b9554a1a43a166c" \
+		if !BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
+	default BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE \
+		if BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
+	bool "Rockchip rkbin tpl file"
+	default n
+
+if BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME
+	string "ddr.bin file path"
+	help
+	  Full path to the tpl file inside the rkbin repository. The
+	  specified file will be copied and used by U-Boot as tpl.
+
+endif # BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
+	bool "Rockchip rkbin bl31 file"
+	default n
+
+if BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME
+	string "bl31.elf file path"
+	help
+	  Full path to the bl31 file inside the rkbin repository. The
+	  specified file will be copied and used by U-Boot as bl31.
+
+endif # BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
+	bool "Rockchip rkbin optee file"
+	default n
+
+if BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
+
+config BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME
+	string "tee.elf file path"
+	help
+	  Full path to the TEE file inside the rkbin repository.
+	  The specified file will be copied and used by U-Boot as
+	  TEE.
+endif # BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
+
+endif # BR2_PACKAGE_ROCKCHIP_RKBIN
diff --git a/package/rockchip-rkbin/rockchip-rkbin.hash b/package/rockchip-rkbin/rockchip-rkbin.hash
new file mode 100644
index 0000000000..5659ecf719
--- /dev/null
+++ b/package/rockchip-rkbin/rockchip-rkbin.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256  6f7b58fe35108101031ebfd3cc6eb7a186f258a1cdbd93c4256888997ab52c8f  rockchip-rkbin-d6ccfe401ca84a98ca3b85c12b9554a1a43a166c-br1.tar.gz
+
diff --git a/package/rockchip-rkbin/rockchip-rkbin.mk b/package/rockchip-rkbin/rockchip-rkbin.mk
new file mode 100644
index 0000000000..7b2f17f7e2
--- /dev/null
+++ b/package/rockchip-rkbin/rockchip-rkbin.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# rockchip-rkbin
+#
+################################################################################
+
+
+ROCKCHIP_RKBIN_VERSION = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_VERSION))
+ROCKCHIP_RKBIN_SITE = https://github.com/rockchip-linux/rkbin.git
+ROCKCHIP_RKBIN_SITE_METHOD = git
+ROCKCHIP_RKBIN_LICENSE = PROPRIETARY
+ROCKCHIP_RKBIN_REDISTRIBUTE = NO
+
+ROCKCHIP_RKBIN_INSTALL_IMAGES = YES
+ROCKCHIP_RKBIN_INSTALL_TARGET = NO
+
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE),y)
+ROCKCHIP_RKBIN_BL31_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))
+BL31_EXTENSION=${suffix $(ROCKCHIP_RKBIN_BL31_FILENAME)}
+endif
+
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE),y)
+ROCKCHIP_RKBIN_TPL_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))
+TPL_EXTENSION=${suffix $(ROCKCHIP_RKBIN_TPL_FILENAME)}
+endif
+
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),y)
+ROCKCHIP_RKBIN_TEE_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))
+TEE_EXTENSION=${suffix $(ROCKCHIP_RKBIN_TEE_FILENAME)}
+endif
+
+define ROCKCHIP_RKBIN_INSTALL_IMAGES_CMDS
+	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE)), \
+		cp $(@D)/$(ROCKCHIP_RKBIN_BL31_FILENAME) $(BINARIES_DIR)/bl31$(BL31_EXTENSION))
+	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE)), \
+		cp $(@D)/$(ROCKCHIP_RKBIN_TPL_FILENAME) $(BINARIES_DIR)/ddr$(TPL_EXTENSION))
+	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE)), \
+		cp $(@D)/$(ROCKCHIP_RKBIN_TEE_FILENAME) $(BINARIES_DIR)/tee$(TEE_EXTENSION))
+endef
+
+ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION),y)
+ifeq ($(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE)),)
+$(error No custom rockchip-rkbin version specified. Check your BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE setting)
+endif
+ROCKCHIP_SOURCE = rockchip-rkbin-$(ROCKCHIP_RKBIN_VERSION)-br1.tar.gz
+BR_NO_CHECK_HASH_FOR += $(ROCKCHIP_SOURCE)
+endif
+
+$(eval $(generic-package))
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 1/3] package: add rockchip-rkbin package

[Thomas Petazzoni via buildroot]

Hello Kilian,

Thanks for your work! See below some comments.

On Fri, 14 Jul 2023 08:44:11 +0200
Kilian Zinnecker via buildroot <buildroot@buildroot.org> wrote:

> This patch adds a package for the Rockchip ATF binary blobs. These
> binaries are needed to build U-Boot for some Rockchip SoCs (e.g.,
> RK3588). One can config a custom version and manually define which
> blobs (for bl31, tpl and tee) to use from the repository. The
> U-Boot package is modified so that it takes the chosen binaries and
> uses them during build.
> 
> Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>

Nit: the commit title should be:

	package/rockchip-rkbin: new package

> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 085397d03d..7733f8501f 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -262,6 +262,15 @@ config BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE
>  	  This option makes sure that the i.MX firmwares are copied into
>  	  the U-Boot source directory.
>  
> +config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN
> +	bool "U-Boot needs rockchip-rkbin"
> +	depends on BR2_PACKAGE_ROCKCHIP_RKBIN
> +	help
> +	  For some Rockchip SoCs U-Boot needs binary blobs from
> +	  Rockchip.
> +	  This option makes sure that the needed binary blobs are copied
> +	  into the U-Boot source directory.
> +
>  menu "U-Boot binary format"
>  
>  config BR2_TARGET_UBOOT_FORMAT_AIS
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 4eae8e95c3..f9f50539e5 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -207,6 +207,23 @@ endef
>  UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_IMX_FW_FILES
>  endif
>  
> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN),y)
> +UBOOT_DEPENDENCIES += rockchip-rkbin
> +define UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN
> +	$(INSTALL) -D -m 0644 $(@D)/u-boot-rockchip.bin $(BINARIES_DIR)/

We need a full destination path here: $(BINARIES_DIR)/u-boot/rockchip.bin

> +endef
> +UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE),y)
> +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31${suffix $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))}

What is this ${...} ?

> +endif
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE),y)
> +UBOOT_MAKE_OPTS += ROCKCHIP_TPL=$(BINARIES_DIR)/ddr${suffix $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))}
> +endif
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),y)
> +$BOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee${suffix $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))}

   ^^ typo, should be UBOOT_MAKE_OPTS


> +endif
> +endif
> +

These changes to boot/uboot/ should be in a separate patch, after the
patch adding rockchip-rkbin.

> diff --git a/package/rockchip-rkbin/Config.in b/package/rockchip-rkbin/Config.in
> new file mode 100644
> index 0000000000..0f2126654e
> --- /dev/null
> +++ b/package/rockchip-rkbin/Config.in
> @@ -0,0 +1,70 @@
> +config BR2_PACKAGE_ROCKCHIP_RKBIN
> +	bool "Rockchip rkbin binary blobs"

Just:

	bool "rockchip-rkbin"

> +	depends on BR2_arm || BR2_aarch64
> +	help
> +	  This package provides Rockchip SoC binary blobs for U-Boot.
> +
> +if BR2_PACKAGE_ROCKCHIP_RKBIN
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> +	bool "Use a custom version"
> +	help
> +	  This option allows to use a specific version.
> +if BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE
> +	string "Rockchip rkbin version"
> +	depends on BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> +
> +endif # BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_VERSION
> +	string
> +	default "d6ccfe401ca84a98ca3b85c12b9554a1a43a166c" \
> +		if !BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> +	default BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE \
> +		if BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION

Is it really likely that a different version, but from the same Git
repository will be needed? I see in your defconfig you're using a
different version than the default used here. Why?

> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
> +	bool "Rockchip rkbin tpl file"
> +	default n

"default n" is never needed, as it's the default.

> +
> +if BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME
> +	string "ddr.bin file path"
> +	help
> +	  Full path to the tpl file inside the rkbin repository. The
> +	  specified file will be copied and used by U-Boot as tpl.
> +
> +endif # BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
> +	bool "Rockchip rkbin bl31 file"
> +	default n
> +
> +if BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME
> +	string "bl31.elf file path"
> +	help
> +	  Full path to the bl31 file inside the rkbin repository. The
> +	  specified file will be copied and used by U-Boot as bl31.
> +
> +endif # BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
> +	bool "Rockchip rkbin optee file"
> +	default n
> +
> +if BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
> +
> +config BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME
> +	string "tee.elf file path"
> +	help
> +	  Full path to the TEE file inside the rkbin repository.
> +	  The specified file will be copied and used by U-Boot as
> +	  TEE.
> +endif # BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE

For those 3 files, do we really need a boolean + a string option? Can't
we simply rely on string options: if the value is empty, there's no
TPL/BL31/TEE, if the value is non-empty, use the file provided.

> diff --git a/package/rockchip-rkbin/rockchip-rkbin.hash b/package/rockchip-rkbin/rockchip-rkbin.hash
> new file mode 100644
> index 0000000000..5659ecf719
> --- /dev/null
> +++ b/package/rockchip-rkbin/rockchip-rkbin.hash
> @@ -0,0 +1,3 @@
> +# Locally computed
> +sha256  6f7b58fe35108101031ebfd3cc6eb7a186f258a1cdbd93c4256888997ab52c8f  rockchip-rkbin-d6ccfe401ca84a98ca3b85c12b9554a1a43a166c-br1.tar.gz
> +

Nit: useless empty new line.

> diff --git a/package/rockchip-rkbin/rockchip-rkbin.mk b/package/rockchip-rkbin/rockchip-rkbin.mk
> new file mode 100644
> index 0000000000..7b2f17f7e2
> --- /dev/null
> +++ b/package/rockchip-rkbin/rockchip-rkbin.mk
> @@ -0,0 +1,49 @@
> +################################################################################
> +#
> +# rockchip-rkbin
> +#
> +################################################################################
> +
> +

Nit: only one empty new line.

> +ROCKCHIP_RKBIN_VERSION = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_VERSION))
> +ROCKCHIP_RKBIN_SITE = https://github.com/rockchip-linux/rkbin.git
> +ROCKCHIP_RKBIN_SITE_METHOD = git

Any reason not to use:

ROCKCHIP_RKBIN_SITE = $(call github,rockchip-linux,rkbin,$(ROCKCHIP_RKBIN_VERSION))

 ?

> +ROCKCHIP_RKBIN_LICENSE = PROPRIETARY
> +ROCKCHIP_RKBIN_REDISTRIBUTE = NO

This is the problematic part I believe. What is the license of this
stuff? Without any license, nobody is allowed to redistribute it. So as
it is, all images produced by Buildroot with this package cannot be
redistributed, making them quite useless, unless it's used by a
hobbyist building his own images for his own usage, without any
redistribution.

We have the same issue with some Amlogic blobs I believe. Blobs are
annoying, but they are even more annoying when there's no license
attached to them that allows redistribution.

> +ROCKCHIP_RKBIN_INSTALL_IMAGES = YES
> +ROCKCHIP_RKBIN_INSTALL_TARGET = NO
> +
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE),y)
> +ROCKCHIP_RKBIN_BL31_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))
> +BL31_EXTENSION=${suffix $(ROCKCHIP_RKBIN_BL31_FILENAME)}

All variables must be prefixed with the package name. Again this
${suffix ...} thing, weird.

> +endif
> +
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE),y)
> +ROCKCHIP_RKBIN_TPL_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))
> +TPL_EXTENSION=${suffix $(ROCKCHIP_RKBIN_TPL_FILENAME)}

All variables must be prefixed with the package name.

> +endif
> +
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),y)
> +ROCKCHIP_RKBIN_TEE_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))
> +TEE_EXTENSION=${suffix $(ROCKCHIP_RKBIN_TEE_FILENAME)}

All variables must be prefixed with the package name.

> +endif
> +
> +define ROCKCHIP_RKBIN_INSTALL_IMAGES_CMDS
> +	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE)), \
> +		cp $(@D)/$(ROCKCHIP_RKBIN_BL31_FILENAME) $(BINARIES_DIR)/bl31$(BL31_EXTENSION))
> +	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE)), \
> +		cp $(@D)/$(ROCKCHIP_RKBIN_TPL_FILENAME) $(BINARIES_DIR)/ddr$(TPL_EXTENSION))
> +	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE)), \
> +		cp $(@D)/$(ROCKCHIP_RKBIN_TEE_FILENAME) $(BINARIES_DIR)/tee$(TEE_EXTENSION))

The filter y construct is a bit useless, you can just do:

	$(if $(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),\
		do something)

> +endef
> +
> +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION),y)
> +ifeq ($(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE)),)
> +$(error No custom rockchip-rkbin version specified. Check your BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE setting)
> +endif
> +ROCKCHIP_SOURCE = rockchip-rkbin-$(ROCKCHIP_RKBIN_VERSION)-br1.tar.gz

Hum, I wonder why this needs to be defined. It seems to work for U-Boot
without having to define UBOOT_SOURCE in uboot.mk, the infrastructure
does it for you.

> +BR_NO_CHECK_HASH_FOR += $(ROCKCHIP_SOURCE)
> +endif

This check should be enclosed in a:

ifeq ($(BR_BUILDING),y)
...
endif

condition.

Overall, mostly cosmetic comments that I could have solved myself, but
the licensing problem is much more significant and I cannot resolve it.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 1/3] package: add rockchip-rkbin package

[Kilian Zinnecker via buildroot]

Hello Thomas,

> Thanks for your work! See below some comments.

Thank you for your review and feedback!

> Nit: the commit title should be:
> 
> 	package/rockchip-rkbin: new package

Thanks, will be fixed in a new patch revision.

> > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN),y)
> > +UBOOT_DEPENDENCIES += rockchip-rkbin
> > +define UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN
> > +	$(INSTALL) -D -m 0644 $(@D)/u-boot-rockchip.bin $(BINARIES_DIR)/
> 
> We need a full destination path here: $(BINARIES_DIR)/u-boot/rockchip.bin

Thanks, will also be fixed.

> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE),y)
> > +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31${suffix $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))}
> What is this ${...} ?

My intention was to rename the binaries to a generic file name (e.g., 
"bl31.xyz" and "tpl.xyz"), while keeping the file type extension. However, I 
now changed this anyway: The original file names are preserved. Hence there is 
no more need for special file type extension anymore and this code has changed
anyway.

> > +endif
> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE),y)
> > +UBOOT_MAKE_OPTS += ROCKCHIP_TPL=$(BINARIES_DIR)/ddr${suffix $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))} +endif
> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),y)
> > +$BOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee${suffix $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))}
>    ^^ typo, should be UBOOT_MAKE_OPTS
> 
> > +endif
> > +endif
> > +
> 
> These changes to boot/uboot/ should be in a separate patch, after the
> patch adding rockchip-rkbin.

Yes, that makes sense. In the next version these changes are put in a separate 
patch.

> > +config BR2_PACKAGE_ROCKCHIP_RKBIN
> > +	bool "Rockchip rkbin binary blobs"
> 
> Just:
> 
> 	bool "rockchip-rkbin"

Done, thanks.

> > +config BR2_PACKAGE_ROCKCHIP_RKBIN_VERSION
> > +	string
> > +	default "d6ccfe401ca84a98ca3b85c12b9554a1a43a166c" \
> > +		if !BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> > +	default BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE \
> > +		if BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
> 
> Is it really likely that a different version, but from the same Git
> repository will be needed?

Yes, I actually believe that in this case, this is a valuable feature: I 
deliberately implemented the package such, that the user will define which 
binaries they want to use, by specifying the binary file path. The problem now 
is, that the Rockchip maintainers of the repository remove or rename the 
binaries between different commits. If we bump this package, we can look for 
all official buildroot board defconfigs and change the binary names specified 
inside those. However, if someone uses their own personal defconfig for some 
own board (e.g., some company which develop custom boards), then their 
defconfigs may break, if we bump the version. Even worse: What if Rockchip 
removes a TPL with some specific frequency, needed by someone? This feature 
allows people to specify commits, where their desired binaries are present.

I don't think this is needed in general for packages. But in this specific 
case, where different binaries may only be present in different commits, I think 
it is a appropriate. However, if you really don't like this, then it would 
also be ok for me to drop this.

> I see in your defconfig you're using a
> different version than the default used here. Why?

Between default commit of the package and the one I chose in the defconfig, the 
binaries needed for the Rock5B actually did not change. I just chose a 
different commit to show and reassure myself, that this feature works, i.e., I 
correctly copied the code from the uboot.mk.

> > +config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE
> > +	bool "Rockchip rkbin tpl file"
> > +	default n
> "default n" is never needed, as it's the default.

Thanks, removed.

> > +config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
> > +	bool "Rockchip rkbin bl31 file"
> > +	default n
> > +
> > +if BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
> > +
> > +config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME
> > +	string "bl31.elf file path"
> > +	help
> > +	  Full path to the bl31 file inside the rkbin repository. The
> > +	  specified file will be copied and used by U-Boot as bl31.
> > +
> > +endif # BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE
> > +
> > +config BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
> > +	bool "Rockchip rkbin optee file"
> > +	default n
> > +
> > +if BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
> > +
> > +config BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME
> > +	string "tee.elf file path"
> > +	help
> > +	  Full path to the TEE file inside the rkbin repository.
> > +	  The specified file will be copied and used by U-Boot as
> > +	  TEE.
> > +endif # BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE
> 
> For those 3 files, do we really need a boolean + a string option? Can't
> we simply rely on string options: if the value is empty, there's no
> TPL/BL31/TEE, if the value is non-empty, use the file provided.

I actually like it this way. But you are not the first one who suggested that 
simply checking, whether the string is empty or not is a better way to go: 
Quentin Schulz also shares your opinion. So I changed it accordingly.

> > +# Locally computed
> > +sha256  6f7b58fe35108101031ebfd3cc6eb7a186f258a1cdbd93c4256888997ab52c8f 
> > rockchip-rkbin-d6ccfe401ca84a98ca3b85c12b9554a1a43a166c-br1.tar.gz +
> 
> Nit: useless empty new line.

Thanks, removed.

> > +#########################################################################
> > ####### +#
> > +# rockchip-rkbin
> > +#
> > +#########################################################################
> > ####### +
> > +
> 
> Nit: only one empty new line.

Also removed.

> > +ROCKCHIP_RKBIN_VERSION = $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_VERSION)) +ROCKCHIP_RKBIN_SITE =
> > https://github.com/rockchip-linux/rkbin.git +ROCKCHIP_RKBIN_SITE_METHOD =
> > git
> 
> Any reason not to use:
> 
> ROCKCHIP_RKBIN_SITE = $(call
> github,rockchip-linux,rkbin,$(ROCKCHIP_RKBIN_VERSION))
> 
>  ?

If I use $(call github,rockchip-linux,rkbin,$(ROCKCHIP_RKBIN_VERSION)) I, the 
following error occurs on my PC:

fatal: repository 'https://github.com/rockchip-linux/rkbin/archive/
78cbbc4f9c36b77a620132ad38d2c6823b4b25fe/' not found

I am not familiar with this, to be honest, so I don't know how to fix this, 
other than using the URL directly.

> > +ROCKCHIP_RKBIN_LICENSE = PROPRIETARY
> > +ROCKCHIP_RKBIN_REDISTRIBUTE = NO
> 
> This is the problematic part I believe. What is the license of this
> stuff? Without any license, nobody is allowed to redistribute it. So as
> it is, all images produced by Buildroot with this package cannot be
> redistributed, making them quite useless, unless it's used by a
> hobbyist building his own images for his own usage, without any
> redistribution.
> 
> We have the same issue with some Amlogic blobs I believe. Blobs are
> annoying, but they are even more annoying when there's no license
> attached to them that allows redistribution.

Well, that seems to be unfortunate. I guess then, there is no point in 
integrating all this into buildroot, if the binaries are not allowed to be 
redistributed?

I wrote an email to some of the Rockchip contributors of the rkbin repository, 
asking them what the license is, regarding the binaries. I hope to get an 
answer soon, and that a LICENSE file is added to the repository. Let's see ...

> > +ROCKCHIP_RKBIN_INSTALL_IMAGES = YES
> > +ROCKCHIP_RKBIN_INSTALL_TARGET = NO
> > +
> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE),y)
> > +ROCKCHIP_RKBIN_BL31_FILENAME = $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))
> > +BL31_EXTENSION=${suffix $(ROCKCHIP_RKBIN_BL31_FILENAME)}
> 
> All variables must be prefixed with the package name. Again this
> ${suffix ...} thing, weird.

Fixed the variable naming and the "suffix" is not there anymore.

> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE),y)
> > +ROCKCHIP_RKBIN_TPL_FILENAME = $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))
> > +TPL_EXTENSION=${suffix $(ROCKCHIP_RKBIN_TPL_FILENAME)}
> 
> All variables must be prefixed with the package name.

Also fixed.

> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),y)
> > +ROCKCHIP_RKBIN_TEE_FILENAME = $(call
> > qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))
> > +TEE_EXTENSION=${suffix $(ROCKCHIP_RKBIN_TEE_FILENAME)}
> 
> All variables must be prefixed with the package name.

And this, too.

> > +endif
> > +
> > +define ROCKCHIP_RKBIN_INSTALL_IMAGES_CMDS
> > +	$(if $(filter y, $(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE)), \
> > +		cp $(@D)/$(ROCKCHIP_RKBIN_BL31_FILENAME)
> > $(BINARIES_DIR)/bl31$(BL31_EXTENSION)) +	$(if $(filter y,
> > $(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE)), \
> > +		cp $(@D)/$(ROCKCHIP_RKBIN_TPL_FILENAME)
> > $(BINARIES_DIR)/ddr$(TPL_EXTENSION)) +	$(if $(filter y,
> > $(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE)), \
> > +		cp $(@D)/$(ROCKCHIP_RKBIN_TEE_FILENAME)
> > $(BINARIES_DIR)/tee$(TEE_EXTENSION))
> The filter y construct is a bit useless, you can just do:
> 
> 	$(if $(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILE),\
> 		do something)

Thanks! I changed this part as well. It now actually checks for the string, as 
the bools were removed (see above).

> > +ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION),y)
> > +ifeq ($(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE)),)
> > +$(error No custom rockchip-rkbin version specified. Check your
> > BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE setting) +endif
> > +ROCKCHIP_SOURCE = rockchip-rkbin-$(ROCKCHIP_RKBIN_VERSION)-br1.tar.gz
> 
> Hum, I wonder why this needs to be defined. It seems to work for U-Boot
> without having to define UBOOT_SOURCE in uboot.mk, the infrastructure
> does it for you.

Well, this ROCKCHIP_SOURCE is just there, because I copied this part of code 
from the uboot.mk, and there there was this variable. But I agree, it is not 
needed and I removed it.

> > +BR_NO_CHECK_HASH_FOR += $(ROCKCHIP_SOURCE)
> > +endif
> 
> This check should be enclosed in a:
> 
> ifeq ($(BR_BUILDING),y)
> ...
> endif
> 
> condition.

Added, thanks!

> Overall, mostly cosmetic comments that I could have solved myself, but
> the licensing problem is much more significant and I cannot resolve it.

Well, as said before, maybe we get some clarification about this in the future. 
At least I hope so, because else this whole board support effort would probably 
then be pointless after all :D

Best regards,
Kilian


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 1/3] package: add rockchip-rkbin package

[Kilian Zinnecker via buildroot]

Hello Thomas, all

> > > +ROCKCHIP_RKBIN_LICENSE = PROPRIETARY
> > > +ROCKCHIP_RKBIN_REDISTRIBUTE = NO
> > 
> > This is the problematic part I believe. What is the license of this
> > stuff? Without any license, nobody is allowed to redistribute it. So as
> > it is, all images produced by Buildroot with this package cannot be
> > redistributed, making them quite useless, unless it's used by a
> > hobbyist building his own images for his own usage, without any
> > redistribution.
> > 
> > We have the same issue with some Amlogic blobs I believe. Blobs are
> > annoying, but they are even more annoying when there's no license
> > attached to them that allows redistribution.
> 
> Well, that seems to be unfortunate. I guess then, there is no point in
> integrating all this into buildroot, if the binaries are not allowed to be
> redistributed?
> 
> I wrote an email to some of the Rockchip contributors of the rkbin
> repository, asking them what the license is, regarding the binaries. I hope
> to get an answer soon, and that a LICENSE file is added to the repository.
> Let's see ...

Rockchip uploaded a license file to their rkbin repository:

https://github.com/rockchip-linux/rkbin/blob/master/LICENSE

It does allow redistribution of the binaries. I made an 8th version of the 
patches, removing the "ROCKCHIP_RKBIN_REDISTRIBUTE = NO" and adding a 
"ROCKCHIP_RKBIN_LICENSE_FILES = LICENSE". I sent the patches to the buildroot 
mailing list. Are there more things, which would need to be fixed, or would 
this be sufficient to add this board support to buildroot?

Best regards,
Kilian




_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 1/3] package: add rockchip-rkbin package

[Thomas Petazzoni via buildroot]

On Wed, 26 Jul 2023 20:28:56 +0200
Kilian Zinnecker <kilian.zinnecker@mail.de> wrote:

> It does allow redistribution of the binaries. I made an 8th version of the 
> patches, removing the "ROCKCHIP_RKBIN_REDISTRIBUTE = NO" and adding a 
> "ROCKCHIP_RKBIN_LICENSE_FILES = LICENSE". I sent the patches to the buildroot 
> mailing list. Are there more things, which would need to be fixed, or would 
> this be sufficient to add this board support to buildroot?

I've seen your v8, thanks a lot for your efforts! I was precisely
talking with Yann E. Morin who told me he was going through your patch
series right now. Expect some news from him soon!

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v6 2/3] configs: add rock5b/rock5b_defconfig

[Kilian Zinnecker via buildroot]

This patch adds the defconfig file needed to build u-boot, kernel
and rootfs for the Rock 5B. In addition it adds a kernel config
fragment file, which activates the needed ethernet driver support.

Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>
---
 DEVELOPERS                        |  2 ++
 board/radxa/rock5b/linux.fragment |  1 +
 configs/rock5b_defconfig          | 44 +++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 board/radxa/rock5b/linux.fragment
 create mode 100644 configs/rock5b_defconfig

diff --git a/DEVELOPERS b/DEVELOPERS
index f6f474967a..715a35aa16 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1792,6 +1792,8 @@ F:	package/libcamera/
 
 N:	Kilian Zinnecker <kilian.zinnecker@mail.de>
 F:	package/rockchip-rkbin/
+F:	configs/rock5b_defconfig
+F:	board/radxa/rock5b/
 
 N:	Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
 F:	package/wqy-zenhei/
diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment
new file mode 100644
index 0000000000..811d42a79b
--- /dev/null
+++ b/board/radxa/rock5b/linux.fragment
@@ -0,0 +1 @@
+CONFIG_R8169=y
diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig
new file mode 100644
index 0000000000..4a07dd5ebc
--- /dev/null
+++ b/configs/rock5b_defconfig
@@ -0,0 +1,44 @@
+BR2_aarch64=y
+BR2_cortex_a76_a55=y
+BR2_KERNEL_HEADERS_5_10=y
+BR2_TARGET_GENERIC_HOSTNAME="rock5b"
+BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board"
+BR2_SYSTEM_DHCP="eth0"
+BR2_USE_WCHAR
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b"
+BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b"
+BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment"
+BR2_PACKAGE_AVAHI=y
+BR2_PACKAGE_AVAHI_DAEMON=y
+BR2_PACKAGE_OPENSSH=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="250M"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588"
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y
+BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_DTC=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_ROCKCHIP_RKBIN=y
+BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION=y
+BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE="78cbbc4f9c36b77a620132ad38d2c6823b4b25fe"
+BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE=y
+BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin"
+BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE=y
+BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.38.elf"
+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 2/3] configs: add rock5b/rock5b_defconfig

[Thomas Petazzoni via buildroot]

Hello Kilian,

The commit title should be:

	configs/rock5b: new defconfig

On Fri, 14 Jul 2023 08:44:12 +0200
Kilian Zinnecker via buildroot <buildroot@buildroot.org> wrote:

> diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig
> new file mode 100644
> index 0000000000..4a07dd5ebc
> --- /dev/null
> +++ b/configs/rock5b_defconfig
> @@ -0,0 +1,44 @@
> +BR2_aarch64=y
> +BR2_cortex_a76_a55=y
> +BR2_KERNEL_HEADERS_5_10=y
> +BR2_TARGET_GENERIC_HOSTNAME="rock5b"
> +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board"
> +BR2_SYSTEM_DHCP="eth0"
> +BR2_USE_WCHAR

Not needed, especially since it has probably no effect.

> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b"
> +BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b"
> +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment"
> +BR2_PACKAGE_AVAHI=y
> +BR2_PACKAGE_AVAHI_DAEMON=y
> +BR2_PACKAGE_OPENSSH=y

Please drop those 3 options, we want a minimal configuration.

> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_4=y
> +BR2_TARGET_ROOTFS_EXT2_SIZE="250M"
> +BR2_TARGET_UBOOT=y
> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588"
> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y
> +BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y
> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> +BR2_PACKAGE_HOST_DTC=y
> +BR2_PACKAGE_HOST_GENIMAGE=y
> +BR2_PACKAGE_HOST_MTOOLS=y
> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y
> +BR2_PACKAGE_ROCKCHIP_RKBIN=y
> +BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION=y
> +BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE="78cbbc4f9c36b77a620132ad38d2c6823b4b25fe"
> +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILE=y
> +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin"
> +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILE=y
> +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.38.elf"

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 2/3] configs: add rock5b/rock5b_defconfig

[Kilian Zinnecker via buildroot]

Hello Thomas,

> The commit title should be:
> 
> 	configs/rock5b: new defconfig

Thanks, fixed  in v7.

> > +BR2_TARGET_GENERIC_HOSTNAME="rock5b"
> > +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board"
> > +BR2_SYSTEM_DHCP="eth0"
> > +BR2_USE_WCHAR
> 
> Not needed, especially since it has probably no effect.

Thanks, also fixed in v7.

> > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
> > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment
> > "
> > +BR2_PACKAGE_AVAHI=y
> > +BR2_PACKAGE_AVAHI_DAEMON=y
> > +BR2_PACKAGE_OPENSSH=y
> 
> Please drop those 3 options, we want a minimal configuration.

Thanks, this one as well.

Best regards,
Kilian




_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v6 3/3] board/radxa/rock5b: Add sdcard image scripts

[Kilian Zinnecker via buildroot]

This patch adds a readme and post image scripts, generating an
sdcard.img file, which can be flashed on an SD card to boot the
Radxa Rock 5B.

Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>
---
 board/radxa/rock5b/boot.cmd      |  3 ++
 board/radxa/rock5b/genimage.cfg  | 34 ++++++++++++++++++
 board/radxa/rock5b/post-image.sh | 20 +++++++++++
 board/radxa/rock5b/readme.txt    | 62 ++++++++++++++++++++++++++++++++
 board/radxa/rock5b/rock5b.its    | 46 ++++++++++++++++++++++++
 configs/rock5b_defconfig         |  5 +++
 6 files changed, 170 insertions(+)
 create mode 100644 board/radxa/rock5b/boot.cmd
 create mode 100644 board/radxa/rock5b/genimage.cfg
 create mode 100755 board/radxa/rock5b/post-image.sh
 create mode 100644 board/radxa/rock5b/readme.txt
 create mode 100644 board/radxa/rock5b/rock5b.its

diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd
new file mode 100644
index 0000000000..9a3e73e003
--- /dev/null
+++ b/board/radxa/rock5b/boot.cmd
@@ -0,0 +1,3 @@
+setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait
+fatload mmc 1:1 ${loadaddr} image.itb
+bootm ${loadaddr}
diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg
new file mode 100644
index 0000000000..2943232fc3
--- /dev/null
+++ b/board/radxa/rock5b/genimage.cfg
@@ -0,0 +1,34 @@
+# SD card image for Radxa Rock 5b
+
+image boot.vfat {
+	vfat {
+		files = {
+			"image.itb",
+			"boot.scr"
+		}
+	}
+	size = 16M
+}
+
+image sdcard.img {
+	hdimage {
+		partition-table-type = "hybrid"
+	}
+
+	partition uboot {
+		in-partition-table = "false"
+		image = "u-boot-rockchip.bin"
+		offset = 32K
+	}
+
+	partition boot {
+		partition-type = "0xC"
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+	}
+}
diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh
new file mode 100755
index 0000000000..674669ac60
--- /dev/null
+++ b/board/radxa/rock5b/post-image.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+GENIMAGE_CFG="$(dirname $0)/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+gzip -fk ${BINARIES_DIR}/Image
+cp board/radxa/rock5b/rock5b.its ${BINARIES_DIR}
+(cd $BINARIES_DIR && mkimage -f rock5b.its image.itb)
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+  --rootpath "${TARGET_DIR}" \
+  --tmppath "${GENIMAGE_TMP}" \
+  --inputpath "${BINARIES_DIR}" \
+  --outputpath "${BINARIES_DIR}" \
+  --config "${GENIMAGE_CFG}"
+
+RET=${?}
+exit ${RET}
diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt
new file mode 100644
index 0000000000..45018a13b4
--- /dev/null
+++ b/board/radxa/rock5b/readme.txt
@@ -0,0 +1,62 @@
+RADXA ROCK 5B
+==============
+https://wiki.radxa.com/Rock5/hardware/5b
+
+Build:
+======
+  $ make rock5b_defconfig
+  $ make
+
+Files created in output directory
+=================================
+
+output/images
+.
+├── Image
+├── Image.gz
+├── bl31.elf
+├── boot.scr
+├── boot.vfat
+├── ddr.bin
+├── image.itb
+├── rk3588-rock-5b.dtb
+├── rock5b.its
+├── rootfs.ext2
+├── rootfs.ext4
+├── rootfs.tar
+├── sdcard.img
+├── u-boot-rockchip.bin
+└── u-boot.bin
+
+Creating bootable SD card:
+==========================
+
+Simply invoke (as root)
+
+sudo dd if=output/images/sdcard.img of=/dev/sdX && sync
+
+Where X is your SD card device.
+
+Booting:
+========
+
+Serial console:
+---------------
+The Rock 5B has a 40-pin GPIO header. Its layout can be seen here:
+https://wiki.radxa.com/Rock5/hardware/5b/gpio
+
+The Uart pins are as follows:
+
+pin 6:  gnd
+pin 8:  tx
+pin 10: rx
+
+Baudrate for this board is 1500000.
+
+Login:
+------
+Enter 'root' as login user, and the prompt is ready.
+
+wiki link:
+----------
+https://forum.radxa.com/c/rock5
diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its
new file mode 100644
index 0000000000..d73659a56e
--- /dev/null
+++ b/board/radxa/rock5b/rock5b.its
@@ -0,0 +1,46 @@
+/dts-v1/;
+
+/ {
+	description = "Rock 5B FIT Image";
+	#address-cells = <1>;
+
+	images {
+		kernel {
+			description = "Kernel";
+			data = /incbin/("Image.gz");
+			type = "kernel";
+			arch = "arm64";
+			os = "linux";
+			compression = "gzip";
+			load = <0x0a200000>;
+			entry = <0x0a200000>;
+			hash {
+				algo = "sha256";
+			};
+		};
+		fdt {
+			description = "Device Tree";
+			data = /incbin/("rk3588-rock-5b.dtb");
+			type = "flat_dt";
+			arch = "arm64";
+			compression = "none";
+			load = <0x0e000000>;
+			entry = <0x0e000000>;
+			hash {
+				algo = "sha256";
+			};
+		};
+	};
+
+	configurations {
+		default = "standard";
+		standard {
+			description = "Standard Boot";
+			kernel = "kernel";
+			fdt = "fdt";
+			hash {
+				algo = "sha256";
+			};
+		};
+	};
+};
diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig
index 4a07dd5ebc..808bedd7ca 100644
--- a/configs/rock5b_defconfig
+++ b/configs/rock5b_defconfig
@@ -1,6 +1,8 @@
 BR2_aarch64=y
 BR2_cortex_a76_a55=y
 BR2_KERNEL_HEADERS_5_10=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS=""
 BR2_TARGET_GENERIC_HOSTNAME="rock5b"
 BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board"
 BR2_SYSTEM_DHCP="eth0"
@@ -29,6 +31,9 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y
 BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_DTC=y
 BR2_PACKAGE_HOST_GENIMAGE=y
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 3/3] board/radxa/rock5b: Add sdcard image scripts

[Thomas Petazzoni via buildroot]

Hello Kilian,

On Fri, 14 Jul 2023 08:44:13 +0200
Kilian Zinnecker via buildroot <buildroot@buildroot.org> wrote:

> This patch adds a readme and post image scripts, generating an
> sdcard.img file, which can be flashed on an SD card to boot the
> Radxa Rock 5B.
> 
> Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>

This should be squashed in the patch adding the defconfig. Indeed
without this, the defconfig doesn't produce anything that can easily be
booted.

> +rm -rf "${GENIMAGE_TMP}"
> +
> +genimage \
> +  --rootpath "${TARGET_DIR}" \
> +  --tmppath "${GENIMAGE_TMP}" \
> +  --inputpath "${BINARIES_DIR}" \
> +  --outputpath "${BINARIES_DIR}" \
> +  --config "${GENIMAGE_CFG}"

Perhaps you could simply call ./support/scripts/genimage.sh directly?

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v6 3/3] board/radxa/rock5b: Add sdcard image scripts

[Kilian Zinnecker via buildroot]

Hello Thomas,

> > Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>
> 
> This should be squashed in the patch adding the defconfig. Indeed
> without this, the defconfig doesn't produce anything that can easily be
> booted.

Makes sense. In v7 the files in the board directory and the defconfig are one 
commit.

> > +rm -rf "${GENIMAGE_TMP}"
> > +
> > +genimage \
> > +  --rootpath "${TARGET_DIR}" \
> > +  --tmppath "${GENIMAGE_TMP}" \
> > +  --inputpath "${BINARIES_DIR}" \
> > +  --outputpath "${BINARIES_DIR}" \
> > +  --config "${GENIMAGE_CFG}"
> 
> Perhaps you could simply call ./support/scripts/genimage.sh directly?

Yes, totally right. I fixed it.

Thanks and best regards,
Kilian


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot