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.

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

nanopi-r5: board config housekeeping #6124

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions config/boards/nanopi-r5c.csc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rockchip RK3568 quad core 4GB eMMC USB3 2x 2.5GbE
# Rockchip RK3568 quad core 4GB eMMC USB3 2x 2.5GbE
BOARD_NAME="NanoPi R5C"
BOARDFAMILY="rockchip64"
BOARDFAMILY="rockchip64"
BOARD_MAINTAINER=""
BOOT_SOC="rk3568"
KERNEL_TARGET="edge"
Expand All @@ -18,11 +18,9 @@ BOOTPATCHDIR="v2023.10"
BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory

OVERLAY_PREFIX="rockchip-rk3568"
DEFAULT_OVERLAYS="nanopi-r5c-leds"

# Newer blobs...
RKBIN_GIT_URL="https://github.com/rpardini/armbian-rkbin.git"
RKBIN_GIT_BRANCH="update-3568-blobs"
DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.18.bin"
BL31_BLOB="rk35/rk3568_bl31_v1.43.elf"

Expand Down
5 changes: 2 additions & 3 deletions config/boards/nanopi-r5s.wip
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ SRC_EXTLINUX="no"
ASOUND_STATE="asound.state.station-m2" # TODO verify me
IMAGE_PARTITION_TABLE="gpt"
FULL_DESKTOP="yes"
INSTALL_HEADERS="yes"
BOOT_LOGO="desktop"

BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's uboot due to his rk3568 work
Expand All @@ -17,11 +18,9 @@ BOOTPATCHDIR="v2023.10"
BOOTCONFIG="nanopi-r5s-rk3568_defconfig"
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory

OVERLAY_PREFIX="rockchip-rk3568"
DEFAULT_OVERLAYS="nanopi-r5s-leds"

# Newer blobs...
RKBIN_GIT_URL="https://github.com/rpardini/armbian-rkbin.git"
RKBIN_GIT_BRANCH="update-3568-blobs"
DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.18.bin"
BL31_BLOB="rk35/rk3568_bl31_v1.43.elf"

Expand Down