Skip to content

Commit

Permalink
rockchip: rename "Rock Pi 4" to "Rock Pi 4A"
Browse files Browse the repository at this point in the history
Kernel has added the different variants of the Rock Pi 4 in commit
b5edb0467370 ("arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a
dts"). The former Rock Pi 4 is now Rock Pi 4A.

For compatibility with kernel 5.4, this rename has been held back
so far. Having switched to kernel 5.10 now, we can finally apply
it in our tree as well.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
  • Loading branch information
adschm committed Oct 9, 2021
1 parent 0c2aa7c commit 91eed5d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 34 deletions.
2 changes: 1 addition & 1 deletion package/boot/uboot-rockchip/Makefile
Expand Up @@ -52,7 +52,7 @@ define U-Boot/rock-pi-4-rk3399
BUILD_SUBTARGET:=armv8
NAME:=Rock Pi 4
BUILD_DEVICES:= \
radxa_rock-pi-4
radxa_rock-pi-4a
DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
ATF:=rk3399_bl31.elf
Expand Down

This file was deleted.

8 changes: 4 additions & 4 deletions target/linux/rockchip/image/armv8.mk
Expand Up @@ -32,12 +32,12 @@ define Device/pine64_rockpro64
endef
TARGET_DEVICES += pine64_rockpro64

define Device/radxa_rock-pi-4
define Device/radxa_rock-pi-4a
DEVICE_VENDOR := Radxa
DEVICE_MODEL := ROCK Pi 4
DEVICE_MODEL := ROCK Pi 4A
SOC := rk3399
SUPPORTED_DEVICES := radxa,rockpi4
SUPPORTED_DEVICES := radxa,rockpi4a radxa,rockpi4
UBOOT_DEVICE_NAME := rock-pi-4-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef
TARGET_DEVICES += radxa_rock-pi-4
TARGET_DEVICES += radxa_rock-pi-4a
10 changes: 0 additions & 10 deletions target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch

This file was deleted.

0 comments on commit 91eed5d

Please sign in to comment.