From: Denys Dmytriyenko <[email protected]> Cleanup and unify again - omapl138-lcdk is the only platform supported in the OMAP-L1 family. Plus there's no longer DaVinci family with corresponding settings. Adjust accordingly.
Please note, there's currently a bug building Rust on ARMv5 platforms: https://bugzilla.yoctoproject.org/show_bug.cgi?id=14967 Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-ti-bsp/conf/machine/include/omapl1.inc | 2 -- meta-ti-bsp/conf/machine/include/omapl138.inc | 14 +++++++++- meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 1 - meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 1 - .../linux/bundle-devicetree.inc | 26 ------------------- .../linux/linux-ti-staging_5.10.bb | 1 - .../recipes-ti/includes/ti-paths.inc | 3 --- 7 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/include/omapl1.inc delete mode 100644 meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc diff --git a/meta-ti-bsp/conf/machine/include/omapl1.inc b/meta-ti-bsp/conf/machine/include/omapl1.inc deleted file mode 100644 index d0262c3f..00000000 --- a/meta-ti-bsp/conf/machine/include/omapl1.inc +++ /dev/null @@ -1,2 +0,0 @@ -require conf/machine/include/ti-soc.inc -SOC_FAMILY:append = ":omapl1" diff --git a/meta-ti-bsp/conf/machine/include/omapl138.inc b/meta-ti-bsp/conf/machine/include/omapl138.inc index c6eb0cd9..2e4a47a5 100644 --- a/meta-ti-bsp/conf/machine/include/omapl138.inc +++ b/meta-ti-bsp/conf/machine/include/omapl138.inc @@ -1,2 +1,14 @@ -require conf/machine/include/omapl1.inc +require conf/machine/include/ti-soc.inc SOC_FAMILY:append = ":omapl138" + +require conf/machine/include/arm/armv5/tune-arm926ejs.inc + +KERNEL_IMAGETYPE = "zImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" + +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa" diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index ba4d5645..b318f82d 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -2,7 +2,6 @@ #@NAME: OMAP-L138 LCDK #@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board -require conf/machine/include/davinci.inc require conf/machine/include/omapl138.inc UBOOT_MACHINE = "omapl138_lcdk_config" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index c0f876e3..d87dcbe1 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -55,7 +55,6 @@ SYSROOT_DIRS += "/boot" # SPL (Second Program Loader) to be loaded over UART SPL_UART_BINARY = "u-boot-spl.bin" SPL_UART_BINARY:k3r5 = "" -SPL_UART_BINARY:lego-ev3 = "" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" diff --git a/meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc b/meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc deleted file mode 100644 index d259e58c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc +++ /dev/null @@ -1,26 +0,0 @@ -# Upstream kernel-devicetree.bbclass only supports bundling the DTB with -# zImage. The factory u-boot on lego-ev3 EEPROM only supports uImage, so we -# append the DTB to the final uImage here. - -do_deploy:append() { - if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then - install -d ${DEPLOYDIR} - for dtbf in ${KERNEL_DEVICETREE}; do - dtb=`normalize_dtb "$dtbf"` - dtb_ext=${dtb##*.} - dtb_base_name=`basename $dtb .$dtb_ext` - for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do - if [ "$type" = "uImage" ]; then - cat ${D}/${KERNEL_IMAGEDEST}/$type \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ - > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin - ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ - ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin - cat ${D}/${KERNEL_IMAGEDEST}/$type \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ - > ${DEPLOYDIR}/$type - fi - done - done - fi -} diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb index a0af03c5..bf230dbc 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -8,7 +8,6 @@ inherit kernel DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-uio.inc -require recipes-kernel/linux/bundle-devicetree.inc require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc index 5994ff0a..63c00e8c 100644 --- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc +++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc @@ -104,8 +104,5 @@ export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DI export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" -DSPSUFFIX:omapl137 = "x674" DSPSUFFIX:omapl138 = "x674" -DSPSUFFIX_ti816x = "xe674" -DSPSUFFIX_ti814x = "xe674" DSPSUFFIX ?= "x64P" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15341): https://lists.yoctoproject.org/g/meta-ti/message/15341 Mute This Topic: https://lists.yoctoproject.org/mt/94950211/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
