Add board support for Radxa Rock 5B
v8 cover Add board support for Radxa Rock 5B
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.
v7 -> v8:
- Added reference to the now existing license file of the rkbin repository in the rockchip-rkbin.mk file
- Bumped the version of the rockchip-rkbin git repository in the package (default version) and the rock5b_defconfig. Changed the binary blob filenames accordingly
v6 -> v7:
- Improved commit titles and commit structure
- uboot.mk: Fixed installation path for binary
- Improved automatical pickup of Rockchip blobs by U-Boot
- rockchip-rkbin.mk: Simplyfied binary selection and installation
- rock5b_defconfig: removed unecessary configurations
- post-image.sh: Exchanged own code by calling genimage support script
- uboot.mk: Fixed UBOOT_MAKE_OPTS typo
- uboot/Config.in: Removed futile default value
- Fixed variable naming in uboot.mk and rockchip-rkbin.mk
- Various further cleanups ...
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/rockchip-rkbin: new package boot/uboot: Add support for Rockchip binary blobs configs/rock5b: new defconfig
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 | 6 +++ 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 | 42 +++++++++++++++ package/Config.in | 1 + package/rockchip-rkbin/Config.in | 47 ++++++++++++++++ package/rockchip-rkbin/rockchip-rkbin.hash | 2 + package/rockchip-rkbin/rockchip-rkbin.mk | 46 ++++++++++++++++ 14 files changed, 321 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
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v8 1/3 package/rockchip-rkbin: new package
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 optee) to use from the repository.
--- DEVELOPERS | 3 ++ package/Config.in | 1 + package/rockchip-rkbin/Config.in | 47 ++++++++++++++++++++++ package/rockchip-rkbin/rockchip-rkbin.hash | 2 + package/rockchip-rkbin/rockchip-rkbin.mk | 46 +++++++++++++++++++++ 5 files changed, 99 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
DEVELOPERS +3 -0
@@ -1803,6 +1803,9 @@ F: package/ramsmp/ N: Kieran Bingham <[email protected]> F: package/libcamera/ +N: Kilian Zinnecker <[email protected]> +F: package/rockchip-rkbin/ + N: Klaus Heinrich Kiwi <[email protected]> F: package/wqy-zenhei/
package/Config.in +1 -0
@@ -580,6 +580,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"
package/rockchip-rkbin/Config.in new file +47 -0
47 lines not on this page · raw message
package/rockchip-rkbin/rockchip-rkbin.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally computed +sha256 bd8d19ace202ff26d1c0b4d7744cd467cd0093801dc674dde57290159eedee2b rockchip-rkbin-b4558da0860ca48bf1a571dd33ccba580b9abe23-br1.tar.gz
package/rockchip-rkbin/rockchip-rkbin.mk new file +46 -0
46 lines not on this page · raw message
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRe: [Buildroot] [PATCH v8 1/3] package/rockchip-rkbin: new package
Killian, All,
On 2023-07-26 20:04 +0200, Kilian Zinnecker via buildroot spake thusly:
Quoted 4 lines
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 optee) to use from the repository.
So, there was no rationale about why we sould need a custom version [0], and the defconfig you provided was actually using the same version as the predefined one, so we did not have any usage for it in-tree.
[0] yes, I read your reply about the question from Thomas, but discussing with him we conluded that we indeed did not want to have a custom version for now. So I dropped it.
If and when the need arises, then it will be time to add it back; see below.
Quoted 1 line
Signed-off-by Kilian Zinnecker <[email protected]>
[--SNIP--]
Quoted 15 lines
package/rockchip-rkbin/Config.in new file +9
-0@@ -0,0 +1,47 @@ +config BR2_PACKAGE_ROCKCHIP_RKBIN + 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
package/rockchip-rkbin/Config.in line 19
Quoted 10 lines
package/rockchip-rkbin/Config.in new file +10
-0+ 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
So, BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE is guarded twice:
once by the if-block, and once be a "depends on". That's sure a strong guard! ;-)
Nonethless, I've dropped it.
[--SNIP--]
package/rockchip-rkbin/Config.in line 31
Quoted 4 lines
package/rockchip-rkbin/Config.in new file +4
-0+config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME + string "Rockchip rkbin tpl file path" + help + Full path to the tpl file inside the rkbin repository. The
I've driopped the "Full" qualifier, because that is not a full path, as it is relative to the top of the rockchip-rkbin directory.
Ditto for the other help texts.
[--SNIP--]
package/rockchip-rkbin/rockchip-rkbin.hash line 2
Quoted 8 lines
package/rockchip-rkbin/rockchip-rkbin.hash new file +2
-0@@ -0,0 +1,2 @@ +# Locally computed +sha256 bd8d19ace202ff26d1c0b4d7744cd467cd0093801dc674dde57290159eedee2b rockchip-rkbin-b4558da0860ca48bf1a571dd33ccba580b9abe23-br1.tar.gz
I've added a hash for the license file. Please check with:
$ make legal-info
or:
$ make rockchip-rkbin-legal-infoQuoted 7 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +1
-0@@ -0,0 +1,46 @@ +################################################################################
package/rockchip-rkbin/rockchip-rkbin.mk line 11
Quoted 10 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +10
-0+# +# 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_LICENSE_FILES = LICENSE
Since the license file was only recently added, it should not be defined except for the known version.
Furthermore, I think hadling the custom version, if we re-introduce it later, should be done with:
Config.in:
config BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
bool "Use a custom version"
help
Some binaries for older hipsets mey get pruned from the latest revisions of the repository. Say 'y' here if your SoC uses such older binaries.
config BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE
string "Custom version"
depends on BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
rocjchip-rkbin.mk:
ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION),)
ROCKCHIP_RKBIN_VERSION = b4558da0860ca48bf1a571dd33ccba580b9abe23
ROCKCHIP_RKBIN_LICENSE_FILES = LICENSE
else
ROCKCHIP_RKBIN_VERSION = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE))
ifeq ($(ROCKCHIP_RKBIN_VERSION),)
$(error blabla check config blabla)
endif
BR_NO_CHECK_HASH_FOR += $(ROCKCHIP_RKBIN_SOURCE)
endifpackage/rockchip-rkbin/rockchip-rkbin.mk line 18
Quoted 6 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +6
-0+ROCKCHIP_RKBIN_INSTALL_IMAGES = YES +ROCKCHIP_RKBIN_INSTALL_TARGET = NO + +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME),"") +ROCKCHIP_RKBIN_BL31_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME)) +endif
No need to test before setting the variable.
Quoted 5 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +5
-0+ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME),"") +ROCKCHIP_RKBIN_TPL_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME)) +endif + +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME),"")
package/rockchip-rkbin/rockchip-rkbin.mk line 34
Quoted 10 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +10
-0+ROCKCHIP_RKBIN_TEE_FILENAME = $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME)) +endif + +define ROCKCHIP_RKBIN_INSTALL_IMAGES_CMDS + $(if $(ROCKCHIP_RKBIN_BL31_FILENAME), \ + cp $(@D)/$(ROCKCHIP_RKBIN_BL31_FILENAME) $(BINARIES_DIR)/${ROCKCHIP_RKBIN_BL31_FILENAME##*/}) + $(if $(ROCKCHIP_RKBIN_TPL_FILENAME), \ + cp $(@D)/$(ROCKCHIP_RKBIN_TPL_FILENAME) $(BINARIES_DIR)/${ROCKCHIP_RKBIN_TPL_FILENAME##*/}) + $(if $(ROCKCHIP_RKBIN_TEE_FILENAME), \ + cp $(@D)/$(ROCKCHIP_RKBIN_TEE_FILENAME) $(BINARIES_DIR)/${ROCKCHIP_RKBIN_TEE_FILENAME##*/})
I've simplified this with a $(foreach...)
Applied to master with these changes, thanks.
Regards,
Yann E. MORIN.
Quoted 19 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +12
-0+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 +ifeq ($(BR_BUILDING),y) +BR_NO_CHECK_HASH_FOR += rockchip-rkbin-$(ROCKCHIP_RKBIN_VERSION)-br1.tar.gz +endif +endif + +$(eval $(generic-package))Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v8 1/3] package/rockchip-rkbin: new package
Hello Yann, all
thanks for your review, fixes and applying the patches. And sorry for the late answer. What I write now is imho not so important anymore, still I want to give some reply:
Quoted 9 lines
Quoted 4 lines
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 optee) to use from the repository.
So, there was no rationale about why we sould need a custom version [0], and the defconfig you provided was actually using the same version as the predefined one, so we did not have any usage for it in-tree.
Quoted 6 lines
[0] yes, I read your reply about the question from Thomas, but discussing with him we conluded that we indeed did not want to have a custom version for now. So I dropped it.
If and when the need arises, then it will be time to add it back; see below.
I personally still favor it, but its not so important to me and I can understand, that you don't see much need at the moment and probably prefer to keep it simple, so I am totally fine with dropping the custom version stuff. As you say: If need arises, we can then revaluate.
[--SNIP--]
Quoted 9 lines
package/rockchip-rkbin/Config.in line 31
Quoted 4 lines
package/rockchip-rkbin/Config.in new file +4
-0+config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME + string "Rockchip rkbin tpl file path" + help + Full path to the tpl file inside the rkbin repository. TheI've driopped the "Full" qualifier, because that is not a full path, as it is relative to the top of the rockchip-rkbin directory.
Ditto for the other help texts.
Agreed. However, you introduced some typo on one occasion, by snipping "Full" and "path" to "Fath ;)
https://gitlab.com/buildroot.org/buildroot/-/blob/
8d1180aa483b624f1be27bd0858c2f6665ebf36c/package/rockchip-rkbin/Config.in#L12
Quoted 11 lines
Quoted 9 lines
(quoted diff) +0
-0b/package/rockchip-rkbin/rockchip-rkbin.hash new file mode 100644 index 0000000000..cb71226556
package/rockchip-rkbin/rockchip-rkbin.hash new file +2
-0@@ -0,0 +1,2 @@ +# Locally computed +sha256 bd8d19ace202ff26d1c0b4d7744cd467cd0093801dc674dde57290159eedee2brockchip-rkbin-b4558da0860ca48bf1a571dd33ccba580b9abe23-br1.tar.gz
I've added a hash for the license file. Please check with:
Quoted 3 lines
$ make legal-info
or:
$ make rockchip-rkbin-legal-infoThanks, seems to work on my PC.
Quoted 40 lines
Quoted 16 lines
(quoted diff) +0
-0
b/package/rockchip-rkbin/rockchip-rkbin.mknew file mode 100644 index 0000000000..74787585e8package/rockchip-rkbin/rockchip-rkbin.mk new file +1
-0@@ -0,0 +1,46 @@ +################################################################################ +#
package/rockchip-rkbin/rockchip-rkbin.mk new file +3
-0+# 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 = gitpackage/rockchip-rkbin/rockchip-rkbin.mk line 11
Quoted 2 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +2
-0+ROCKCHIP_RKBIN_LICENSE = PROPRIETARY +ROCKCHIP_RKBIN_LICENSE_FILES = LICENSESince the license file was only recently added, it should not be defined except for the known version.
Furthermore, I think hadling the custom version, if we re-introduce it later, should be done with:
Config.in:
config
BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION
bool "Use a custom version"
help
Some binaries for older hipsets mey get pruned from the latest revisions of the repository. Say 'y' here if your SoC uses such older binaries.config
BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE
string "Custom version"
depends onBR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSIONrocjchip-rkbin.mk:
Quoted 11 lines
ifeq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION),)
ROCKCHIP_RKBIN_VERSION = b4558da0860ca48bf1a571dd33ccba580b9abe23
ROCKCHIP_RKBIN_LICENSE_FILES = LICENSE
else
ROCKCHIP_RKBIN_VERSION = $(call
qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_CUSTOM_VERSION_VALUE)) ifeq
($(ROCKCHIP_RKBIN_VERSION),)
$(error blabla check config blabla)
endif
BR_NO_CHECK_HASH_FOR += $(ROCKCHIP_RKBIN_SOURCE)
endifGreat, thanks! I did actually have in mind, that the custom version and the (in older versions not existing) LICENSE file may cause problems. But I didn't know what to do about it and forgot to ask here. Thanks!
[--SNIP--]
Quoted 11 lines
Quoted 11 lines
package/rockchip-rkbin/rockchip-rkbin.mk new file +2
-0+ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME),"") +ROCKCHIP_RKBIN_TPL_FILENAME = $(callqstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME)) +endif
package/rockchip-rkbin/rockchip-rkbin.mk new file +3
-0+ +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME),"") +ROCKCHIP_RKBIN_TEE_FILENAME = $(callqstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME)) +endif
package/rockchip-rkbin/rockchip-rkbin.mk new file +4
-0+ +define ROCKCHIP_RKBIN_INSTALL_IMAGES_CMDS + $(if $(ROCKCHIP_RKBIN_BL31_FILENAME), \ + cp $(@D)/$(ROCKCHIP_RKBIN_BL31_FILENAME)
Quoted 8 lines
Quoted 7 lines
$(BINARIES_DIR)/${ROCKCHIP_RKBIN_BL31_FILENAME##*/}) + $(if
$(ROCKCHIP_RKBIN_TPL_FILENAME), \package/rockchip-rkbin/rockchip-rkbin.mk new file +1
-0+ cp $(@D)/$(ROCKCHIP_RKBIN_TPL_FILENAME)$(BINARIES_DIR)/${ROCKCHIP_RKBIN_TPL_FILENAME##*/}) + $(if
$(ROCKCHIP_RKBIN_TEE_FILENAME), \package/rockchip-rkbin/rockchip-rkbin.mk new file +1
-0+ cp $(@D)/$(ROCKCHIP_RKBIN_TEE_FILENAME)$(BINARIES_DIR)/${ROCKCHIP_RKBIN_TEE_FILENAME##*/})
I've simplified this with a $(foreach...)
Thanks, much better of course!
Quoted 1 line
Applied to master with these changes, thanks.
Thanks for reviewing!
Best regards,
Kilian
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v8 1/3] package/rockchip-rkbin: new package
Kilian, All,
On 2023-08-07 13:45 +0200, Kilian Zinnecker spake thusly:
[--SNIP--]
Quoted 9 lines
Quoted 7 lines
package/rockchip-rkbin/Config.in line 31
Quoted 4 lines
package/rockchip-rkbin/Config.in new file +4
-0+config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME + string "Rockchip rkbin tpl file path" + help + Full path to the tpl file inside the rkbin repository. TheI've driopped the "Full" qualifier, because that is not a full path, as it is relative to the top of the rockchip-rkbin directory. Ditto for the other help texts.
Agreed. However, you introduced some typo on one occasion, by snipping "Full" and "path" to "Fath ;)
You may have noticed that typoes are my hallmark, the very personal signature of mine! ;-)
Quoted 2 lines
https://gitlab.com/buildroot.org/buildroot/-/blob/
8d1180aa483b624f1be27bd0858c2f6665ebf36c/package/rockchip-rkbin/Config.in#L12
Fixed, thanks.
Regards,
Yann E. MORIN.
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v8 2/3 boot/uboot: Add support for Rockchip binary blobs
In reply to Kilian Zinnecker via buildrootCurrently for some Rockchip SoCs binary blobs are needed, e.g., for the RK3588 bl31 and tpl. These blobs are provided by Rockchip. This patch adds U-Boot package options to use theses binaries, provided by the rockchip-rkbin package, which is also introduced in this patch series. The U-Boot package is modified so that it takes the chosen binaries and automatically uses them during build.
--- boot/uboot/Config.in | 9 +++++++++ boot/uboot/uboot.mk | 17 +++++++++++++++++ 2 files changed, 26 insertions(+)
boot/uboot/Config.in +9 -0
@@ -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
boot/uboot/uboot.mk +17 -0
@@ -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)/u-boot-rockchip.bin +endef +UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME),"") +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/${notdir $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))} +endif +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME),"") +UBOOT_MAKE_OPTS += ROCKCHIP_TPL=$(BINARIES_DIR)/${notdir $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))} +endif +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME),"") +UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/${notdir $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))} +endif +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc UBOOT_MAKE_OPTS += DTC=$(HOST_DIR)/bin/dtc
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRe: [Buildroot] [PATCH v8 2/3] boot/uboot: Add support for Rockchip binary blobs
Kilian, All,
On 2023-07-26 20:04 +0200, Kilian Zinnecker via buildroot spake thusly:
Quoted 39 lines
Currently for some Rockchip SoCs binary blobs are needed, e.g., for the RK3588 bl31 and tpl. These blobs are provided by Rockchip. This patch adds U-Boot package options to use theses binaries, provided by the rockchip-rkbin package, which is also introduced in this patch series. The U-Boot package is modified so that it takes the chosen binaries and automatically uses them during build.
Signed-off-by Kilian Zinnecker <[email protected]>--- boot/uboot/Config.in | 9 +++++++++ boot/uboot/uboot.mk | 17 +++++++++++++++++ 2 files changed, 26 insertions(+)boot/uboot/Config.in +9
-0@@ -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_AISboot/uboot/uboot.mk +0
-0@@ -207,6 +207,23 @@ endef UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_IMX_FW_FILES
boot/uboot/uboot.mk endef · line 217
Quoted 10 lines
boot/uboot/uboot.mk +8
-0endif +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)/u-boot-rockchip.bin +endef +UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME),"") +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/${notdir $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))}
I've re-used the already-qstripped variables from the rockchip-rkbin package.
Also, I switched from using curly brances to the ;ore standard (for Buildroot) parethesis.
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 19 lines
boot/uboot/uboot.mk +9
-0+endif +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME),"") +UBOOT_MAKE_OPTS += ROCKCHIP_TPL=$(BINARIES_DIR)/${notdir $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME))} +endif +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME),"") +UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/${notdir $(call qstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_TEE_FILENAME))} +endif +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc UBOOT_MAKE_OPTS += DTC=$(HOST_DIR)/bin/dtcSignature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v8 2/3] boot/uboot: Add support for Rockchip binary blobs
Hello Yann, all,
[--SNIP--]
Quoted 12 lines
Quoted 9 lines
boot/uboot/uboot.mk +4
-0+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)/u-boot-rockchip.bin +endef
boot/uboot/uboot.mk +3
-0+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN +ifneq ($(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME),"") +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/${notdir $(callqstrip,$(BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME))}
I've re-used the already-qstripped variables from the rockchip-rkbin package.
Quoted 2 lines
Also, I switched from using curly brances to the ;ore standard (for Buildroot) parethesis.
Yes, much better of course, thanks!
[--SNIP--]
Best regards,
Kilian
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v8 3/3 configs/rock5b: new defconfig
In reply to Kilian Zinnecker via buildrootThis 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. It also adds a readme and post image scripts, needed to generate an sdcard.img file, which can be flashed on an SD card to boot the Radxa Rock 5B.
--- DEVELOPERS | 2 + board/radxa/rock5b/boot.cmd | 3 ++ board/radxa/rock5b/genimage.cfg | 34 +++++++++++++++++ board/radxa/rock5b/linux.fragment | 1 + board/radxa/rock5b/post-image.sh | 6 +++ board/radxa/rock5b/readme.txt | 62 +++++++++++++++++++++++++++++++ board/radxa/rock5b/rock5b.its | 46 +++++++++++++++++++++++ configs/rock5b_defconfig | 42 +++++++++++++++++++++ 8 files changed, 196 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
DEVELOPERS +2 -0
@@ -1805,6 +1805,8 @@ F: package/libcamera/ N: Kilian Zinnecker <[email protected]> F: package/rockchip-rkbin/ +F: configs/rock5b_defconfig +F: board/radxa/rock5b/ N: Klaus Heinrich Kiwi <[email protected]> F: package/wqy-zenhei/
board/radxa/rock5b/boot.cmd new file +3 -0
@@ -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}
board/radxa/rock5b/genimage.cfg new file +34 -0
@@ -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" + } +}
board/radxa/rock5b/linux.fragment new file +1 -0
@@ -0,0 +1 @@ +CONFIG_R8169=y
board/radxa/rock5b/post-image.sh new file +6 -0
@@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +gzip -fk ${BINARIES_DIR}/Image +cp board/radxa/rock5b/rock5b.its ${BINARIES_DIR} +(cd $BINARIES_DIR && mkimage -f rock5b.its image.itb) +support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg
board/radxa/rock5b/readme.txt new file +62 -0
62 lines not on this page · raw message
board/radxa/rock5b/rock5b.its new file +46 -0
46 lines not on this page · raw message
configs/rock5b_defconfig new file +42 -0
42 lines not on this page · raw message
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRe: [Buildroot] [PATCH v8 3/3] configs/rock5b: new defconfig
Kilian, All,
On 2023-07-26 20:04 +0200, Kilian Zinnecker via buildroot spake thusly:
Quoted 9 lines
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. It also adds a readme and post image scripts, needed to generate an sdcard.img file, which can be flashed on an SD card to boot the Radxa Rock 5B.
Signed-off-by Kilian Zinnecker <[email protected]>---
[--SNIP--]
board/radxa/rock5b/post-image.sh line 6
Quoted 12 lines
board/radxa/rock5b/post-image.sh new file +6
-0@@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +gzip -fk ${BINARIES_DIR}/Image +cp board/radxa/rock5b/rock5b.its ${BINARIES_DIR} +(cd $BINARIES_DIR && mkimage -f rock5b.its image.itb) +support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg
$ make check-package
board/radxa/rock5b/post-image.sh:0: run 'shellcheck' and fix the warningsI fixed those errors. I also made the script "set -e" so it exits on error on the first error.
I've also dropped the custom version, which in fact was not custom.
Applied to master, thanks.
Regards,
Yann E. MORIN.
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot