MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2025-07-04 20:54:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

KERNEL_DEVICETREE: 32-bit re-org

Browse Source 
The upstream kernel reorganized the 32-bit arch/arm device-tree directory
structure to separate out the device-trees by manufacturer (similar to the
organization of the arch/arm64 device-trees). Update the references to
32-bit arm device-trees to match.

This patch can now be applied since all pre-6.5-rc1 kernels have been
removed from oe-core.

NOTE: trying to build a post-6.5-rc1 32-bit kernel with this patch applied
      will fail

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Stephen Chen <stephen@radxa.com>
This commit is contained in:
Trevor Woerner 2023-10-03 00:19:41 -04:00
parent 5f10374c07
commit 13316b7968
9 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/rockchip-gpt-img.bbclass
View File

@ -108,7 +108,7 @@ create_rk_image () {
mcopy -i ${WORKDIR}/${BOOT_IMG} -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::${KERNEL_IMAGETYPE}
DEVICETREE_DEFAULT=""
for DTS_FILE in ${KERNEL_DEVICETREE}; do
for DTS_FILE in $(echo ${KERNEL_DEVICETREE} | cut -d'/' -f2); do
[ -n "${DEVICETREE_DEFAULT}"] && DEVICETREE_DEFAULT="${DTS_FILE}"
mcopy -i ${WORKDIR}/${BOOT_IMG} -s ${DEPLOY_DIR_IMAGE}/${DTS_FILE} ::${DTS_FILE}
done

2
conf/machine/firefly-rk3288.conf
View File

@ -9,5 +9,5 @@
require conf/machine/include/rk3288.inc
require conf/machine/include/rockchip-wic.inc
KERNEL_DEVICETREE = "rk3288-firefly.dtb"
KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb"
UBOOT_MACHINE = "firefly-rk3288_defconfig"

6
conf/machine/include/rockchip-wic.inc
View File

@ -11,9 +11,13 @@ WKS_FILE_DEPENDS ?= " \
virtual/bootloader \
virtual/kernel \
"
# KERNEL_DEVICETREE follows the pattern of 'rockchip/${SOC_FAMILY}-${BOARD}.dtb'
# but is placed in the deploy directory as simply '${SOC_FAMILY}-${BOARD}.dtb'
# therefore we have to strip off the 'rockchip/' for IMAGE_BOOT_FILES
NONFITDT="${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}"
IMAGE_BOOT_FILES = " \
${KERNEL_IMAGETYPE} \
${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${KERNEL_DEVICETREE}', d)} \
${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)} \
"
# use the first-defined <baud>;<device> pair in SERIAL_CONSOLES

2
conf/machine/marsboard-rk3066.conf
View File

@ -8,4 +8,4 @@
require conf/machine/include/rk3066.inc
KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"
KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb"

2
conf/machine/radxarock.conf
View File

@ -9,4 +9,4 @@
require conf/machine/include/rk3188.inc
KERNEL_DEVICETREE = "rk3188-radxarock.dtb"
KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb"

2
conf/machine/rock2-square.conf
View File

@ -9,7 +9,7 @@
require conf/machine/include/rk3288.inc
SPL_BINARY = "u-boot-spl-dtb.bin"
KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb"
UBOOT_MACHINE = "rock2_defconfig"
# This board doesn't support the combined idbloader, so resort to the older

2
conf/machine/tinker-board-s.conf
View File

@ -7,5 +7,5 @@
require conf/machine/include/tinker.inc
KERNEL_DEVICETREE = "rk3288-tinker-s.dtb"
KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb"
UBOOT_MACHINE = "tinker-s-rk3288_defconfig"

2
conf/machine/tinker-board.conf
View File

@ -7,5 +7,5 @@
require conf/machine/include/tinker.inc
KERNEL_DEVICETREE = "rk3288-tinker.dtb"
KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb"
UBOOT_MACHINE = "tinker-rk3288_defconfig"

2
conf/machine/vyasa-rk3288.conf
View File

@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc
require conf/machine/include/rockchip-wic.inc
KERNEL_IMAGETYPE = "uImage"
KERNEL_DEVICETREE = "rk3288-vyasa.dtb"
KERNEL_DEVICETREE = "rockchip/rk3288-vyasa.dtb"
KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000"
UBOOT_MACHINE = "vyasa-rk3288_defconfig"