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: [email protected] [mailto:meta-arago-
[email protected]] On Behalf Of Denys Dmytriyenko
Sent: Monday, May 04, 2020 4:55 PM
To: [email protected]
Subject: [EXTERNAL] [meta-arago] [master][PATCH 2/4] toolchain: remove
secondary toolchain hack

From: Denys Dmytriyenko <[email protected]>

With K3 R5F support in meta-ti now, this hack is no longer needed.

Signed-off-by: Denys Dmytriyenko <[email protected]>
---
  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
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to