With U-Boot supporting both am64xx-evm and am64xx-sk with single defocnfig, there is not need for a new machine for am64xx-sk. So, drop support for am64xx-sk machine.
Signed-off-by: Lokesh Vutla <[email protected]> --- conf/machine/am64xx-sk-k3r5.conf | 11 ----------- conf/machine/am64xx-sk.conf | 11 ----------- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 17 ----------------- recipes-bsp/u-boot/u-boot-ti.inc | 6 ------ 4 files changed, 45 deletions(-) delete mode 100644 conf/machine/am64xx-sk-k3r5.conf delete mode 100644 conf/machine/am64xx-sk.conf diff --git a/conf/machine/am64xx-sk-k3r5.conf b/conf/machine/am64xx-sk-k3r5.conf deleted file mode 100644 index 07ca5902..00000000 --- a/conf/machine/am64xx-sk-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx SK (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx SK (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_sk_r5_defconfig" diff --git a/conf/machine/am64xx-sk.conf b/conf/machine/am64xx-sk.conf deleted file mode 100644 index 445ff723..00000000 --- a/conf/machine/am64xx-sk.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx SK -#@DESCRIPTION: Machine configuration for the TI AM64xx SK board - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_sk_a53_defconfig" - -KERNEL_DEVICETREE = " \ - ti/k3-am642-sk.dtb \ -" diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index e6fa460c..87fdec68 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -3,7 +3,6 @@ require recipes-bsp/ti-sci-fw/ti-sci-fw.inc DEPENDS = "openssl-native u-boot-mkimage-native dtc-native" DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader" DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_am64xx-sk-k3r5 = " virtual/bootloader" CLEANBROKEN = "1" PR = "r1" @@ -54,7 +53,6 @@ EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']} EXTRA_OEMAKE_append_j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_am64xx-sk-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ @@ -117,19 +115,4 @@ do_deploy_am64xx-evm-k3r5() { install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ } -do_install_am64xx-sk-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy_am64xx-sk-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - addtask deploy before do_build after do_compile diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index e5f92f4b..dc8d6b06 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -66,7 +66,6 @@ SPL_UART_BINARY_k3r5 = "" SPL_UART_BINARY_lego-ev3 = "" SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_am64xx-sk-k3r5 = "u-boot-spl.bin" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" @@ -402,9 +401,4 @@ do_deploy_append_am64xx-evm-k3r5 () { mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true } -do_deploy_append_am64xx-sk-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - TOOLCHAIN = "gcc" -- 2.30.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13784): https://lists.yoctoproject.org/g/meta-ti/message/13784 Mute This Topic: https://lists.yoctoproject.org/mt/82891756/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
