Skip to content

Commit 6beac98

Browse files
committed
add support for rzg2ul som
1 parent 6084dab commit 6beac98

11 files changed

Lines changed: 43 additions & 5 deletions

.github/workflows/build.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,13 @@ jobs:
102102

103103
- name: Register buildroot mirror
104104
run: echo 'BR2_PRIMARY_SITE="http://ciserver.ci:8000/cimirror/buildroot_mirror"' >> configs/buildroot/rz-solidrun_defconfig
105-
105+
106+
- name: Build for RZ/G2UL
107+
shell: bash
108+
run: |
109+
COMPRESSION_FORMAT=xz MACHINE=rzg2ul-solidrun ./runme.sh
110+
COMPRESSION_FORMAT=xz DISTRO=debian MACHINE=rzg2ul-solidrun ./runme.sh
111+
106112
- name: Build for RZ/G2LC
107113
shell: bash
108114
run: |
@@ -240,6 +246,8 @@ jobs:
240246
id: dl_url
241247
shell: bash {0}
242248
run: |
249+
echo "rzg2ul_buildroot_url=http://ciserver.ci:8000/cipublish/${{ needs.build_images.outputs.local_artifacts_path }}/rzg2ul-solidrun-sd-buildroot-${{ needs.info.outputs.build_rev }}.img.xz" >> "$GITHUB_OUTPUT"
250+
echo "rzg2ul_debian_url=http://ciserver.ci:8000/cipublish/${{ needs.build_images.outputs.local_artifacts_path }}/rzg2ul-solidrun-sd-debian-${{ needs.info.outputs.build_rev }}.img.xz" >> "$GITHUB_OUTPUT"
243251
echo "rzg2lc_buildroot_url=http://ciserver.ci:8000/cipublish/${{ needs.build_images.outputs.local_artifacts_path }}/rzg2lc-solidrun-sd-buildroot-${{ needs.info.outputs.build_rev }}.img.xz" >> "$GITHUB_OUTPUT"
244252
echo "rzg2lc_debian_url=http://ciserver.ci:8000/cipublish/${{ needs.build_images.outputs.local_artifacts_path }}/rzg2lc-solidrun-sd-debian-${{ needs.info.outputs.build_rev }}.img.xz" >> "$GITHUB_OUTPUT"
245253
echo "rzg2l_buildroot_url=http://ciserver.ci:8000/cipublish/${{ needs.build_images.outputs.local_artifacts_path }}/rzg2l-solidrun-sd-buildroot-${{ needs.info.outputs.build_rev }}.img.xz" >> "$GITHUB_OUTPUT"
@@ -263,6 +271,22 @@ jobs:
263271
timeout: 36000
264272
jobs: |
265273
[
274+
{
275+
"device_type": "rz",
276+
"tags": ["rz_g2ul"],
277+
"image_url": "${{ steps.dl_url.outputs.rzg2ul_buildroot_url }}",
278+
"description": "RZ/G2UL Buildroot - build_rzg2lc/${{ needs.info.outputs.build_ref }} (${{ needs.info.outputs.build_rev }})",
279+
"compression": "xz",
280+
"all_devices": false
281+
},
282+
{
283+
"device_type": "rz",
284+
"tags": ["rz_g2ul"],
285+
"image_url": "${{ steps.dl_url.outputs.rzg2ul_debian_url }}",
286+
"description": "RZ/G2UL Debian - build_rzg2lc/${{ needs.info.outputs.build_ref }} (${{ needs.info.outputs.build_rev }})",
287+
"compression": "xz",
288+
"all_devices": false
289+
},
266290
{
267291
"device_type": "rz",
268292
"tags": ["rz_g2lc"],

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ Note: this is not regulary tested due to the wide range of distros and versions.
8686
### Configuration Options
8787

8888
- `MACHINE`: Select target HW
89+
- `rzg2ul-solidrun` (RZ/G2UL SoM based boards)
8990
- `rzg2lc-solidrun` (RZ/G2LC SoM based boards, default)
9091
- `rzg2l-solidrun` (RZ/G2L SoM based boards)
9192
- `rzv2l-solidrun` (RZ/V2L SoM based boards)

build_scripts/build_atf.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ source "${ROOTDIR}/build_scripts/build_common.sh"
33

44
TFA_BUILD_TYPE="release"
55
# TFA_BUILD_TYPE="debug"
6+
: ${TFA_EXTRA_ARGS:=}
67

78
TFA_UBOOT_BIN="${OUTPUT_DIR_UBOOT}/u-boot.bin"
89

@@ -20,7 +21,7 @@ atf_do_compile() {
2021
fi
2122
CROSS_COMPILE=${CROSS_TOOLCHAIN} BUILD_BASE=${BUILDDIR_TMP_TFA} make -j "${MAKE_JOBS}" bl2 bl31 fip \
2223
PLAT="${TFA_PLATFORM}" BOARD="${TFA_BOARD}" BL33=${TFA_UBOOT_BIN} FIP_ALIGN=16 \
23-
RZG_DRAM_ECC_FULL=0 DEBUG=$debug
24+
RZG_DRAM_ECC_FULL=0 DEBUG=$debug $TFA_EXTRA_ARGS
2425
}
2526

2627
atf_create_bootparams() {

build_scripts/build_kernel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ kernel_do_install() {
3131
mkdir -p "${OUTPUT_DIR_KERNEL}/dtbs"
3232
cp "${BUILDDIR_TMP_KERNEL}/arch/arm64/boot/Image" "${OUTPUT_DIR_KERNEL}"
3333
cp "${BUILDDIR_TMP_KERNEL}/arch/arm64/boot/Image.gz" "${OUTPUT_DIR_KERNEL}"
34+
cp ${BUILDDIR_TMP_KERNEL}/arch/arm64/boot/dts/renesas/r9a07g043*hummingboard*.dtb* "${OUTPUT_DIR_KERNEL}/dtbs"
3435
cp ${BUILDDIR_TMP_KERNEL}/arch/arm64/boot/dts/renesas/r9a07g044*hummingboard*.dtb* "${OUTPUT_DIR_KERNEL}/dtbs"
3536
cp ${BUILDDIR_TMP_KERNEL}/arch/arm64/boot/dts/renesas/r9a07g054*hummingboard*.dtb* "${OUTPUT_DIR_KERNEL}/dtbs"
3637
cp ${BUILDDIR_TMP_KERNEL}/arch/arm64/boot/dts/renesas/rz*hummingboard*.dtbo "${OUTPUT_DIR_KERNEL}/dtbs"

build_scripts/build_uboot.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ u_boot_do_configure() {
1111
u_boot_do_compile() {
1212
cd "${SRC_DIR_UBOOT}"
1313
CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_UBOOT}" "${UBOOT_DEFCONFIG}"
14+
CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_UBOOT}" savedefconfig
1415
CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_UBOOT}" -j ${MAKE_JOBS}
1516
}
1617

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cyfmac43439-sdio.bin
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cyfmac43439-sdio.1YN.clm_blob
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cyfmac43439-sdio.solidrun,rzg2lc-sr-som.txt

0 commit comments

Comments
 (0)