Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rock-s0 / rockpi-s: quote board vars #7650

Merged
merged 1 commit into from
Jan 5, 2025
Merged

rock-s0 / rockpi-s: quote board vars #7650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions config/boards/rock-s0.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions config/boards/rockpi-s.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down