From 8c20a470a4764defac3e9e2323697851da84e404 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 4 Jan 2025 01:13:30 +0100 Subject: [PATCH] `rock-s0` / `rockpi-s`: quote board vars - so JSON pipeline stops complaining --- config/boards/rock-s0.conf | 30 +++++++++++++++--------------- config/boards/rockpi-s.conf | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/config/boards/rock-s0.conf b/config/boards/rock-s0.conf index 8bb1955c012f..a71b09a0ffce 100644 --- a/config/boards/rock-s0.conf +++ b/config/boards/rock-s0.conf @@ -2,31 +2,31 @@ # https://radxa.com/products/rocks/s0 BOARD_NAME="Rock S0" -BOARDFAMILY=rockchip64 +BOARDFAMILY="rockchip64" BOARD_MAINTAINER="brentr" -BOOTCONFIG=rock-s0-rk3308_defconfig -BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb +BOOTCONFIG="rock-s0-rk3308_defconfig" +BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb" -KERNEL_TARGET=current,edge -KERNEL_TEST_TARGET=current +KERNEL_TARGET="current,edge" +KERNEL_TEST_TARGET="current" -DEFAULT_CONSOLE=serial -SERIALCON=ttyS0 +DEFAULT_CONSOLE="serial" +SERIALCON="ttyS0" MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost" -HAS_VIDEO_OUTPUT=no +HAS_VIDEO_OUTPUT="no" -BOOTBRANCH_BOARD=tag:v2024.10 -BOOTPATCHDIR=v2024.10 -BOOT_SCENARIO=binman -DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin -BL31_BLOB=rk33/rk3308_bl31_v2.26.elf +BOOTBRANCH_BOARD="tag:v2024.10" +BOOTPATCHDIR="v2024.10" +BOOT_SCENARIO="binman" +DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin" +BL31_BLOB="rk33/rk3308_bl31_v2.26.elf" -OVERLAY_PREFIX=rk3308 +OVERLAY_PREFIX="rk3308" function post_family_config__rocks0() { declare -g BOOTDIR="u-boot-${BOARD}" - declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd + declare -g BOOTSCRIPT="boot-rockchip64-ttyS0.cmd:boot.cmd" family_tweaks_bsp() { #overrides rockchip64_common.inc #Install udev script that derives fixed, unique MAC addresses for net interfaces diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.conf index c61d8a4b83ac..75ea2f2ab812 100644 --- a/config/boards/rockpi-s.conf +++ b/config/boards/rockpi-s.conf @@ -2,31 +2,31 @@ # https://radxa.com/products/rockpi/pis BOARD_NAME="Rockpi S" -BOARDFAMILY=rockchip64 +BOARDFAMILY="rockchip64" BOARD_MAINTAINER="brentr" -BOOTCONFIG=rock-pi-s-rk3308_defconfig -BOOT_FDT_FILE=rockchip/rk3308-rock-pi-s.dtb +BOOTCONFIG="rock-pi-s-rk3308_defconfig" +BOOT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb" -KERNEL_TARGET=current,edge -KERNEL_TEST_TARGET=current +KERNEL_TARGET="current,edge" +KERNEL_TEST_TARGET="current" -DEFAULT_CONSOLE=serial -SERIALCON=ttyS0 +DEFAULT_CONSOLE="serial" +SERIALCON="ttyS0" MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost" -HAS_VIDEO_OUTPUT=no +HAS_VIDEO_OUTPUT="no" -BOOTBRANCH_BOARD=tag:v2024.10 -BOOTPATCHDIR=v2024.10 -BOOT_SCENARIO=binman -DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin -BL31_BLOB=rk33/rk3308_bl31_v2.26.elf +BOOTBRANCH_BOARD="tag:v2024.10" +BOOTPATCHDIR="v2024.10" +BOOT_SCENARIO="binman" +DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin" +BL31_BLOB="rk33/rk3308_bl31_v2.26.elf" -OVERLAY_PREFIX=rk3308 +OVERLAY_PREFIX="rk3308" function post_family_config__rockpis() { declare -g BOOTDIR="u-boot-${BOARD}" - declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd + declare -g BOOTSCRIPT="boot-rockchip64-ttyS0.cmd:boot.cmd" family_tweaks_bsp() { #overrides rockchip64_common.inc #Install udev script that derives fixed, unique MAC addresses for net interfaces