* [master][PATCH 1/4] recipes-bsp: meta-ti now builds multiconfig u-boot/ti-sci-fw for R5
@ 2020-05-04 20:54 Denys Dmytriyenko
2020-05-04 20:54 ` [master][PATCH 2/4] toolchain: remove secondary toolchain hack Denys Dmytriyenko
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Denys Dmytriyenko @ 2020-05-04 20:54 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/arago.conf | 7 --
.../recipes-bsp/ti-sci-fw/ti-sci-fw_2020.03.bb | 94 ----------------------
.../recipes-bsp/u-boot/u-boot-k3-r5_2020.01.bb | 25 ------
3 files changed, 126 deletions(-)
delete mode 100644 meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.03.bb
delete mode 100644 meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2020.01.bb
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 2fcb953..1c78692 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -154,13 +154,6 @@ RDEPENDS_pulseaudio-server_remove = "alsa-plugins-pulseaudio-conf"
# Configure RAMFS for jailhouse linux-demo
JH_RAMFS_IMAGE = "arago-tiny-image"
-# K3 devices also requre R5 SPL and SYSFW to boot
-EXTRA_IMAGEDEPENDS_append_k3 = " u-boot-k3-r5 ti-sci-fw"
-IMAGE_BOOT_FILES_append_k3 = " tiboot3.bin sysfw.itb"
-EXTRA_WIC_DEPENDS = ""
-EXTRA_WIC_DEPENDS_k3 = "u-boot-k3-r5:do_deploy ti-sci-fw:do_deploy"
-do_image_wic[depends] += "${EXTRA_WIC_DEPENDS}"
-
# Enable UI and scripting for perf
PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
diff --git a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.03.bb b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.03.bb
deleted file mode 100644
index bae8e5c..0000000
--- a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.03.bb
+++ /dev/null
@@ -1,94 +0,0 @@
-SUMMARY = "TI SCI firmware"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
-
-CLEANBROKEN = "1"
-PR = "r0"
-
-COMPATIBLE_MACHINE = "k3"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-TI_SECURE_DEV_PKG ?= ""
-export TI_SECURE_DEV_PKG
-
-SRCREV = "1c5f73de97c27d99dd8672d9c26c450cd9a4677d"
-BRANCH ?= "ti-linux-firmware"
-SRCREV_imggen = "79f3807e0b169f2029dec9f3a679c231f4deb625"
-SRCREV_FORMAT = "imggen"
-
-SRC_URI = " \
- git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \
- git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \
-"
-
-S = "${WORKDIR}/git"
-
-SYSFW_SOC_am65xx = "am65x"
-SYSFW_SOC_j7 = "j721e"
-SYSFW_CONFIG = "evm"
-
-SYSFW_PREFIX = "ti-sci-firmware"
-
-SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-gp"
-SYSFW_BASE_am65xx-hs-evm = "${SYSFW_PREFIX}-${SYSFW_SOC}-hs"
-SYSFW_BASE_j7-hs-evm = "${SYSFW_PREFIX}-${SYSFW_SOC}-hs"
-
-SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin"
-SYSFW_TISCI_am65xx-hs-evm = "${S}/ti-sysfw/${SYSFW_BASE}-*.bin"
-SYSFW_TISCI_j7-hs-evm = "${S}/ti-sysfw/${SYSFW_BASE}-*.bin"
-
-SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_IMAGE = "sysfw-${PV}.itb"
-SYSFW_SYMLINK = "sysfw.itb"
-
-CFLAGS[unexport] = "1"
-LDFLAGS[unexport] = "1"
-AS[unexport] = "1"
-LD[unexport] = "1"
-
-do_configure[noexec] = "1"
-
-CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${ELT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'linaro']}"
-CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${EAT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'arm']}"
-PATH_prepend = "${TOOLCHAIN_PATH_ARMV7}/bin:"
-
-EXTRA_OEMAKE = "\
- CROSS_COMPILE=${CROSS_COMPILE_V7} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \
- SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
-"
-EXTRA_OEMAKE_append_am65xx-hs-evm = " \
- HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
-"
-EXTRA_OEMAKE_append_j7-hs-evm = " \
- HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
-"
-
-do_compile() {
- cd ${WORKDIR}/imggen/
- oe_runmake
-}
-
-do_install() {
- install -d ${D}/boot
- install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_IMAGE}
- ln -sf ${SYSFW_IMAGE} ${D}/boot/${SYSFW_SYMLINK}
-}
-
-FILES_${PN} = "/boot"
-
-inherit deploy
-
-do_deploy () {
- install -d ${DEPLOYDIR}
- install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
- rm -f ${DEPLOYDIR}/${SYSFW_SYMLINK}
- ln -sf ${SYSFW_IMAGE} ${DEPLOYDIR}/${SYSFW_SYMLINK}
-
- install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-addtask deploy before do_build after do_compile
diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2020.01.bb b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2020.01.bb
deleted file mode 100644
index f368572..0000000
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2020.01.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti-staging_${PV}.bb
-
-PROVIDES = ""
-PKG_${PN} = "${PN}"
-PKG_${PN}-dev = "${PN}-dev"
-PKG_${PN}-dbg = "${PN}-dbg"
-
-COMPATIBLE_MACHINE = "k3"
-
-CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${ELT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'linaro']}"
-CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${EAT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'arm']}"
-PATH_prepend = "${TOOLCHAIN_PATH_ARMV7}/bin:"
-
-UBOOT_MACHINE_am65xx-evm = "am65x_evm_r5_defconfig"
-UBOOT_MACHINE_am65xx-hs-evm = "am65x_hs_evm_r5_defconfig"
-UBOOT_MACHINE_j7-evm = "j721e_evm_r5_defconfig"
-UBOOT_MACHINE_j7-hs-evm = "j721e_hs_evm_r5_defconfig"
-
-EXTRA_OEMAKE = 'ARCH=arm CROSS_COMPILE=${CROSS_COMPILE_V7} CC="${CROSS_COMPILE_V7}gcc ${TOOLCHAIN_OPTIONS}" V=1'
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
-
-UBOOT_BINARY = "tiboot3.bin"
-UBOOT_IMAGE = "tiboot3-${MACHINE}-${PV}-${PR}.bin"
-UBOOT_SYMLINK = "tiboot3-${MACHINE}.bin"
-SPL_BINARY_k3 = ""
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [master][PATCH 2/4] toolchain: remove secondary toolchain hack 2020-05-04 20:54 [master][PATCH 1/4] recipes-bsp: meta-ti now builds multiconfig u-boot/ti-sci-fw for R5 Denys Dmytriyenko @ 2020-05-04 20:54 ` Denys Dmytriyenko 2020-05-04 21:06 ` [EXTERNAL] " Stiffler, Jacob 2020-05-04 20:54 ` [master][PATCH 3/4] packagegroup: ti-sci-fw is only compatible with k3r5, not main k3 Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 4/4] arago.conf: only need to separate TMPDIR by TCMODE, not ARCH Denys Dmytriyenko 2 siblings, 1 reply; 7+ messages in thread From: Denys Dmytriyenko @ 2020-05-04 20:54 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> With K3 R5F support in meta-ti now, this hack is no longer needed. Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- meta-arago-distro/conf/distro/include/toolchain-arm.inc | 6 ------ .../recipes-core/meta/external-arm-secondary-sdk-toolchain.bb | 4 ---- .../packagegroups/packagegroup-cross-canadian.bbappend | 10 ---------- 3 files changed, 20 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc b/meta-arago-distro/conf/distro/include/toolchain-arm.inc index d2c2b2f..fd63256 100644 --- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc +++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc @@ -9,9 +9,6 @@ EAT_TARGET_SYS_arm = "${EAT_TARGET_SYS_ARMV5}" EAT_TARGET_SYS_armv7a = "${EAT_TARGET_SYS_ARMV7}" EAT_TARGET_SYS_aarch64 = "${EAT_TARGET_SYS_ARMV8}" -SECONDARY_TARGET_ARCH = "" -SECONDARY_TARGET_ARCH_k3 = "armv7a" - TARGET_VENDOR = "" TOOLCHAIN_BASE ?= "/opt" @@ -34,9 +31,6 @@ PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain" #PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain" -PREFERRED_PROVIDER_gcc-cross-canadian-${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain" -PREFERRED_PROVIDER_binutils-cross-canadian-${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain" - # Special case for gdb to be built as part of canadian-cross-sdk, instead of packaged from external toolchain bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${exec_prefix}/bin" PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" diff --git a/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb b/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb deleted file mode 100644 index 22a8aa0..0000000 --- a/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_ARCH := "${SECONDARY_TARGET_ARCH}" -MACHINEOVERRIDES := "${SECONDARY_TARGET_ARCH}" - -require recipes-core/meta/external-arm-sdk-toolchain.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend deleted file mode 100644 index fb728e0..0000000 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -PR_append = ".arago0" - -SECONDARY_TARGET_ARCH ?= "" - -SECONDARY_TOOLCHAIN = "gcc-cross-canadian-${SECONDARY_TARGET_ARCH} \ - binutils-cross-canadian-${SECONDARY_TARGET_ARCH}" - -RDEPENDS_${PN}_append = " \ - ${@oe.utils.conditional('SECONDARY_TARGET_ARCH', '', '', '${SECONDARY_TOOLCHAIN}', d)} \ -" -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [EXTERNAL] [master][PATCH 2/4] toolchain: remove secondary toolchain hack 2020-05-04 20:54 ` [master][PATCH 2/4] toolchain: remove secondary toolchain hack Denys Dmytriyenko @ 2020-05-04 21:06 ` Stiffler, Jacob 2020-05-04 21:16 ` Denys Dmytriyenko 0 siblings, 1 reply; 7+ messages in thread From: Stiffler, Jacob @ 2020-05-04 21:06 UTC (permalink / raw) To: Denys Dmytriyenko, meta-arago@arago-project.org NAK. This was for adding the R5 toolchain into the devkit so that we can build the R5 u-boot from the SDK. > -----Original Message----- > From: meta-arago-bounces@arago-project.org [mailto:meta-arago- > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko > Sent: Monday, May 04, 2020 4:55 PM > To: meta-arago@arago-project.org > Subject: [EXTERNAL] [meta-arago] [master][PATCH 2/4] toolchain: remove > secondary toolchain hack > > From: Denys Dmytriyenko <denys@ti.com> > > With K3 R5F support in meta-ti now, this hack is no longer needed. > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > --- > meta-arago-distro/conf/distro/include/toolchain-arm.inc | 6 ------ > .../recipes-core/meta/external-arm-secondary-sdk-toolchain.bb | 4 ---- > .../packagegroups/packagegroup-cross-canadian.bbappend | 10 --------- > - > 3 files changed, 20 deletions(-) > delete mode 100644 meta-arago-distro/recipes-core/meta/external-arm- > secondary-sdk-toolchain.bb > delete mode 100644 meta-arago-distro/recipes- > core/packagegroups/packagegroup-cross-canadian.bbappend > > diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc > b/meta-arago-distro/conf/distro/include/toolchain-arm.inc > index d2c2b2f..fd63256 100644 > --- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc > +++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc > @@ -9,9 +9,6 @@ EAT_TARGET_SYS_arm = "${EAT_TARGET_SYS_ARMV5}" > EAT_TARGET_SYS_armv7a = "${EAT_TARGET_SYS_ARMV7}" > EAT_TARGET_SYS_aarch64 = "${EAT_TARGET_SYS_ARMV8}" > > -SECONDARY_TARGET_ARCH = "" > -SECONDARY_TARGET_ARCH_k3 = "armv7a" > - > TARGET_VENDOR = "" > > TOOLCHAIN_BASE ?= "/opt" > @@ -34,9 +31,6 @@ PREFERRED_PROVIDER_gcc-cross-canadian- > ${TRANSLATED_TARGET_ARCH} ?= "external-arm > PREFERRED_PROVIDER_binutils-cross-canadian- > ${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain" > #PREFERRED_PROVIDER_gdb-cross-canadian- > ${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain" > > -PREFERRED_PROVIDER_gcc-cross-canadian-${SECONDARY_TARGET_ARCH} > ?= "external-arm-secondary-sdk-toolchain" > -PREFERRED_PROVIDER_binutils-cross-canadian- > ${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain" > - > # Special case for gdb to be built as part of canadian-cross-sdk, instead of > packaged from external toolchain > bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = > "${exec_prefix}/bin" > PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} > = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" > diff --git a/meta-arago-distro/recipes-core/meta/external-arm-secondary- > sdk-toolchain.bb b/meta-arago-distro/recipes-core/meta/external-arm- > secondary-sdk-toolchain.bb > deleted file mode 100644 > index 22a8aa0..0000000 > --- a/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk- > toolchain.bb > +++ /dev/null > @@ -1,4 +0,0 @@ > -TARGET_ARCH := "${SECONDARY_TARGET_ARCH}" > -MACHINEOVERRIDES := "${SECONDARY_TARGET_ARCH}" > - > -require recipes-core/meta/external-arm-sdk-toolchain.bb > diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup- > cross-canadian.bbappend b/meta-arago-distro/recipes- > core/packagegroups/packagegroup-cross-canadian.bbappend > deleted file mode 100644 > index fb728e0..0000000 > --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross- > canadian.bbappend > +++ /dev/null > @@ -1,10 +0,0 @@ > -PR_append = ".arago0" > - > -SECONDARY_TARGET_ARCH ?= "" > - > -SECONDARY_TOOLCHAIN = "gcc-cross-canadian- > ${SECONDARY_TARGET_ARCH} \ > - binutils-cross-canadian-${SECONDARY_TARGET_ARCH}" > - > -RDEPENDS_${PN}_append = " \ > - ${@oe.utils.conditional('SECONDARY_TARGET_ARCH', '', '', > '${SECONDARY_TOOLCHAIN}', d)} \ > -" > -- > 2.7.4 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [EXTERNAL] [master][PATCH 2/4] toolchain: remove secondary toolchain hack 2020-05-04 21:06 ` [EXTERNAL] " Stiffler, Jacob @ 2020-05-04 21:16 ` Denys Dmytriyenko 2020-05-05 11:12 ` Jacob Stiffler 0 siblings, 1 reply; 7+ messages in thread From: Denys Dmytriyenko @ 2020-05-04 21:16 UTC (permalink / raw) To: Stiffler, Jacob; +Cc: meta-arago@arago-project.org On Mon, May 04, 2020 at 09:06:32PM +0000, Stiffler, Jacob wrote: > This was for adding the R5 toolchain into the devkit so that we can build > the R5 u-boot from the SDK. Which would have to be done properly now, following multiconfig changes in meta-ti, not as a hack, which won't work and conflicts with those changes... This is unfortunate, but is necessary for many existing and upcoming features. > > -----Original Message----- > > From: meta-arago-bounces@arago-project.org [mailto:meta-arago- > > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko > > Sent: Monday, May 04, 2020 4:55 PM > > To: meta-arago@arago-project.org > > Subject: [EXTERNAL] [meta-arago] [master][PATCH 2/4] toolchain: remove > > secondary toolchain hack > > > > From: Denys Dmytriyenko <denys@ti.com> > > > > With K3 R5F support in meta-ti now, this hack is no longer needed. > > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > --- > > meta-arago-distro/conf/distro/include/toolchain-arm.inc | 6 ------ > > .../recipes-core/meta/external-arm-secondary-sdk-toolchain.bb | 4 ---- > > .../packagegroups/packagegroup-cross-canadian.bbappend | 10 --------- > > - > > 3 files changed, 20 deletions(-) > > delete mode 100644 meta-arago-distro/recipes-core/meta/external-arm- > > secondary-sdk-toolchain.bb > > delete mode 100644 meta-arago-distro/recipes- > > core/packagegroups/packagegroup-cross-canadian.bbappend > > > > diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc > > b/meta-arago-distro/conf/distro/include/toolchain-arm.inc > > index d2c2b2f..fd63256 100644 > > --- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc > > +++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc > > @@ -9,9 +9,6 @@ EAT_TARGET_SYS_arm = "${EAT_TARGET_SYS_ARMV5}" > > EAT_TARGET_SYS_armv7a = "${EAT_TARGET_SYS_ARMV7}" > > EAT_TARGET_SYS_aarch64 = "${EAT_TARGET_SYS_ARMV8}" > > > > -SECONDARY_TARGET_ARCH = "" > > -SECONDARY_TARGET_ARCH_k3 = "armv7a" > > - > > TARGET_VENDOR = "" > > > > TOOLCHAIN_BASE ?= "/opt" > > @@ -34,9 +31,6 @@ PREFERRED_PROVIDER_gcc-cross-canadian- > > ${TRANSLATED_TARGET_ARCH} ?= "external-arm > > PREFERRED_PROVIDER_binutils-cross-canadian- > > ${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain" > > #PREFERRED_PROVIDER_gdb-cross-canadian- > > ${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain" > > > > -PREFERRED_PROVIDER_gcc-cross-canadian-${SECONDARY_TARGET_ARCH} > > ?= "external-arm-secondary-sdk-toolchain" > > -PREFERRED_PROVIDER_binutils-cross-canadian- > > ${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain" > > - > > # Special case for gdb to be built as part of canadian-cross-sdk, instead of > > packaged from external toolchain > > bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = > > "${exec_prefix}/bin" > > PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} > > = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" > > diff --git a/meta-arago-distro/recipes-core/meta/external-arm-secondary- > > sdk-toolchain.bb b/meta-arago-distro/recipes-core/meta/external-arm- > > secondary-sdk-toolchain.bb > > deleted file mode 100644 > > index 22a8aa0..0000000 > > --- a/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk- > > toolchain.bb > > +++ /dev/null > > @@ -1,4 +0,0 @@ > > -TARGET_ARCH := "${SECONDARY_TARGET_ARCH}" > > -MACHINEOVERRIDES := "${SECONDARY_TARGET_ARCH}" > > - > > -require recipes-core/meta/external-arm-sdk-toolchain.bb > > diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup- > > cross-canadian.bbappend b/meta-arago-distro/recipes- > > core/packagegroups/packagegroup-cross-canadian.bbappend > > deleted file mode 100644 > > index fb728e0..0000000 > > --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross- > > canadian.bbappend > > +++ /dev/null > > @@ -1,10 +0,0 @@ > > -PR_append = ".arago0" > > - > > -SECONDARY_TARGET_ARCH ?= "" > > - > > -SECONDARY_TOOLCHAIN = "gcc-cross-canadian- > > ${SECONDARY_TARGET_ARCH} \ > > - binutils-cross-canadian-${SECONDARY_TARGET_ARCH}" > > - > > -RDEPENDS_${PN}_append = " \ > > - ${@oe.utils.conditional('SECONDARY_TARGET_ARCH', '', '', > > '${SECONDARY_TOOLCHAIN}', d)} \ > > -" > > -- > > 2.7.4 > > > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [EXTERNAL] [master][PATCH 2/4] toolchain: remove secondary toolchain hack 2020-05-04 21:16 ` Denys Dmytriyenko @ 2020-05-05 11:12 ` Jacob Stiffler 0 siblings, 0 replies; 7+ messages in thread From: Jacob Stiffler @ 2020-05-05 11:12 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org [-- Attachment #1: Type: text/plain, Size: 5201 bytes --] On 5/4/2020 5:16 PM, Denys Dmytriyenko wrote: > On Mon, May 04, 2020 at 09:06:32PM +0000, Stiffler, Jacob wrote: >> This was for adding the R5 toolchain into the devkit so that we can build >> the R5 u-boot from the SDK. > Which would have to be done properly now, following multiconfig changes in > meta-ti, not as a hack, which won't work and conflicts with those changes... What is the proper way to provide a prebuilt external toolchain inside the SDK? > This is unfortunate, but is necessary for many existing and upcoming features. I do not see why the multiconfig change impacts this secondary toolchain. This change is relatively independent and is only needed to add the armv7 toolchain to the devkit. Can you update the commit message, because this is still needed if you wish to build the R5 u-boot using the devkit. > >>> -----Original Message----- >>> From: meta-arago-bounces@arago-project.org [mailto:meta-arago- >>> bounces@arago-project.org] On Behalf Of Denys Dmytriyenko >>> Sent: Monday, May 04, 2020 4:55 PM >>> To: meta-arago@arago-project.org >>> Subject: [EXTERNAL] [meta-arago] [master][PATCH 2/4] toolchain: remove >>> secondary toolchain hack >>> >>> From: Denys Dmytriyenko <denys@ti.com> >>> >>> With K3 R5F support in meta-ti now, this hack is no longer needed. >>> >>> Signed-off-by: Denys Dmytriyenko <denys@ti.com> >>> --- >>> meta-arago-distro/conf/distro/include/toolchain-arm.inc | 6 ------ >>> .../recipes-core/meta/external-arm-secondary-sdk-toolchain.bb | 4 ---- >>> .../packagegroups/packagegroup-cross-canadian.bbappend | 10 --------- >>> - >>> 3 files changed, 20 deletions(-) >>> delete mode 100644 meta-arago-distro/recipes-core/meta/external-arm- >>> secondary-sdk-toolchain.bb >>> delete mode 100644 meta-arago-distro/recipes- >>> core/packagegroups/packagegroup-cross-canadian.bbappend >>> >>> diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc >>> b/meta-arago-distro/conf/distro/include/toolchain-arm.inc >>> index d2c2b2f..fd63256 100644 >>> --- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc >>> +++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc >>> @@ -9,9 +9,6 @@ EAT_TARGET_SYS_arm = "${EAT_TARGET_SYS_ARMV5}" >>> EAT_TARGET_SYS_armv7a = "${EAT_TARGET_SYS_ARMV7}" >>> EAT_TARGET_SYS_aarch64 = "${EAT_TARGET_SYS_ARMV8}" >>> >>> -SECONDARY_TARGET_ARCH = "" >>> -SECONDARY_TARGET_ARCH_k3 = "armv7a" >>> - >>> TARGET_VENDOR = "" >>> >>> TOOLCHAIN_BASE ?= "/opt" >>> @@ -34,9 +31,6 @@ PREFERRED_PROVIDER_gcc-cross-canadian- >>> ${TRANSLATED_TARGET_ARCH} ?= "external-arm >>> PREFERRED_PROVIDER_binutils-cross-canadian- >>> ${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain" >>> #PREFERRED_PROVIDER_gdb-cross-canadian- >>> ${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain" >>> >>> -PREFERRED_PROVIDER_gcc-cross-canadian-${SECONDARY_TARGET_ARCH} >>> ?= "external-arm-secondary-sdk-toolchain" >>> -PREFERRED_PROVIDER_binutils-cross-canadian- >>> ${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain" >>> - >>> # Special case for gdb to be built as part of canadian-cross-sdk, instead of >>> packaged from external toolchain >>> bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = >>> "${exec_prefix}/bin" >>> PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} >>> = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" >>> diff --git a/meta-arago-distro/recipes-core/meta/external-arm-secondary- >>> sdk-toolchain.bb b/meta-arago-distro/recipes-core/meta/external-arm- >>> secondary-sdk-toolchain.bb >>> deleted file mode 100644 >>> index 22a8aa0..0000000 >>> --- a/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk- >>> toolchain.bb >>> +++ /dev/null >>> @@ -1,4 +0,0 @@ >>> -TARGET_ARCH := "${SECONDARY_TARGET_ARCH}" >>> -MACHINEOVERRIDES := "${SECONDARY_TARGET_ARCH}" >>> - >>> -require recipes-core/meta/external-arm-sdk-toolchain.bb >>> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup- >>> cross-canadian.bbappend b/meta-arago-distro/recipes- >>> core/packagegroups/packagegroup-cross-canadian.bbappend >>> deleted file mode 100644 >>> index fb728e0..0000000 >>> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross- >>> canadian.bbappend >>> +++ /dev/null >>> @@ -1,10 +0,0 @@ >>> -PR_append = ".arago0" >>> - >>> -SECONDARY_TARGET_ARCH ?= "" >>> - >>> -SECONDARY_TOOLCHAIN = "gcc-cross-canadian- >>> ${SECONDARY_TARGET_ARCH} \ >>> - binutils-cross-canadian-${SECONDARY_TARGET_ARCH}" >>> - >>> -RDEPENDS_${PN}_append = " \ >>> - ${@oe.utils.conditional('SECONDARY_TARGET_ARCH', '', '', >>> '${SECONDARY_TOOLCHAIN}', d)} \ >>> -" >>> -- >>> 2.7.4 >>> >>> _______________________________________________ >>> meta-arago mailing list >>> meta-arago@arago-project.org >>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago >> _______________________________________________ >> meta-arago mailing list >> meta-arago@arago-project.org >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago [-- Attachment #2: Type: text/html, Size: 25233 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* [master][PATCH 3/4] packagegroup: ti-sci-fw is only compatible with k3r5, not main k3 2020-05-04 20:54 [master][PATCH 1/4] recipes-bsp: meta-ti now builds multiconfig u-boot/ti-sci-fw for R5 Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 2/4] toolchain: remove secondary toolchain hack Denys Dmytriyenko @ 2020-05-04 20:54 ` Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 4/4] arago.conf: only need to separate TMPDIR by TCMODE, not ARCH Denys Dmytriyenko 2 siblings, 0 replies; 7+ messages in thread From: Denys Dmytriyenko @ 2020-05-04 20:54 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Hence, packaging ti-sci-fw-src has to be done via multiconfig, to be added later. Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- .../packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb index 32d6c98..6dcb253 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb @@ -38,7 +38,6 @@ UTILS_append_k2g = " \ UTILS_append_k3 = " \ jailhouse-src \ - ti-sci-fw-src \ arm-trusted-firmware-src \ " -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [master][PATCH 4/4] arago.conf: only need to separate TMPDIR by TCMODE, not ARCH 2020-05-04 20:54 [master][PATCH 1/4] recipes-bsp: meta-ti now builds multiconfig u-boot/ti-sci-fw for R5 Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 2/4] toolchain: remove secondary toolchain hack Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 3/4] packagegroup: ti-sci-fw is only compatible with k3r5, not main k3 Denys Dmytriyenko @ 2020-05-04 20:54 ` Denys Dmytriyenko 2 siblings, 0 replies; 7+ messages in thread From: Denys Dmytriyenko @ 2020-05-04 20:54 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- meta-arago-distro/conf/distro/arago.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index 1c78692..a0dbadb 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -72,7 +72,7 @@ INITRAMFS_FSTYPES_k2l-hs-evm = "cpio.gz" # Mask any broken recipes (currently none) #BBMASK = "" -TMPDIR .= "-${ARMPKGARCH}-${TCMODE}" +TMPDIR .= "-${TCMODE}" LIBC_DEPENDENCIES_remove = "glibc-gconv-cp1252 glibc-gconv-ibm850 glibc-gconv-iso8859-1 glibc-gconv-iso8859-15 glibc-localedata-i18n" -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-05-05 11:14 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-05-04 20:54 [master][PATCH 1/4] recipes-bsp: meta-ti now builds multiconfig u-boot/ti-sci-fw for R5 Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 2/4] toolchain: remove secondary toolchain hack Denys Dmytriyenko 2020-05-04 21:06 ` [EXTERNAL] " Stiffler, Jacob 2020-05-04 21:16 ` Denys Dmytriyenko 2020-05-05 11:12 ` Jacob Stiffler 2020-05-04 20:54 ` [master][PATCH 3/4] packagegroup: ti-sci-fw is only compatible with k3r5, not main k3 Denys Dmytriyenko 2020-05-04 20:54 ` [master][PATCH 4/4] arago.conf: only need to separate TMPDIR by TCMODE, not ARCH Denys Dmytriyenko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.