mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-04-20 19:53:43 +00:00
conf: am57/am33/am43: Add/fix DEVICETREE_FILE
The new kernel directory stucture for the DTBs is causing problems when assembing the image files. It produces errors like this: output: install: cannot stat 'deploy-ti/images/XXXX-evm/omap/XXXX.dtb': No such file or directory or output: install: cannot stat 'deploy-ti/images/XXXX-evm/ti/omap/XXXX.dtb': No such file or directory The issue comes from the UBOOT_EXTLINUX_BOOT_FILES list. am57 already had a mechanism but it was missing the omap/ dir to remove, and am33 and am43 were just takeing KERNEL_DEVICETREE directly. This patch fixes both cases. Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
@@ -24,7 +24,7 @@ UBOOT_ARCH = "arm"
|
||||
UBOOT_ENTRYPOINT = "0x80008000"
|
||||
UBOOT_LOADADDRESS = "0x80008000"
|
||||
|
||||
DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
|
||||
DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}"
|
||||
|
||||
# Generate an extlinux.conf file
|
||||
UBOOT_EXTLINUX = "1"
|
||||
|
||||
@@ -44,6 +44,8 @@ UBOOT_MACHINE = "am335x_evm_config"
|
||||
UBOOT_ENTRYPOINT = "0x80008000"
|
||||
UBOOT_LOADADDRESS = "0x80008000"
|
||||
|
||||
DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
|
||||
|
||||
# Generate an extlinux.conf file
|
||||
UBOOT_EXTLINUX = "1"
|
||||
UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
|
||||
@@ -51,7 +53,7 @@ UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon"
|
||||
UBOOT_EXTLINUX_BOOT_FILES = " \
|
||||
extlinux.conf;extlinux/extlinux.conf \
|
||||
${KERNEL_IMAGETYPE} \
|
||||
${KERNEL_DEVICETREE} \
|
||||
${DEVICETREE_FILE} \
|
||||
"
|
||||
|
||||
SPL_BINARY = "MLO"
|
||||
|
||||
@@ -41,13 +41,15 @@ UBOOT_MACHINE = "am43xx_evm_config"
|
||||
UBOOT_ENTRYPOINT = "0x80008000"
|
||||
UBOOT_LOADADDRESS = "0x80008000"
|
||||
|
||||
DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
|
||||
|
||||
# Generate an extlinux.conf file
|
||||
UBOOT_EXTLINUX = "1"
|
||||
UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
|
||||
UBOOT_EXTLINUX_BOOT_FILES = " \
|
||||
extlinux.conf;extlinux/extlinux.conf \
|
||||
${KERNEL_IMAGETYPE} \
|
||||
${KERNEL_DEVICETREE} \
|
||||
${DEVICETREE_FILE} \
|
||||
"
|
||||
|
||||
SPL_BINARY = "MLO"
|
||||
|
||||
Reference in New Issue
Block a user