ppa: update to use Recipe Specific Sysroots

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 17 insertions, 24 deletions

diff --git a/recipes-bsp/ppa/ppa/ppa.its b/recipes-bsp/ppa/ppa/ppa.its
deleted file mode 100644
index c157b6e53..000000000
--- a/recipes-bsp/ppa/ppa/ppa.its
+++ /dev/null
@@ -1,23 +0,0 @@
-/dts-v1/;
-
-/{
-        description = "PPA Firmware";
-#address-cells = <1>;
-        images {
-                firmware@1 {
-                        description = "PPA Firmware: Version 0.1";
-                        data = /incbin/("obj/monitor.bin");
-                        type = "firmware";
-                        arch = "arm64";
-                        compression = "none";
-                };
-        };
-
-        configurations {
-                default = "config@1";
-                config@1 {
-                        description = "Boot PPA firmware";
-                        firmware = "firmware@1";
-                };
-        };
-};
diff --git a/recipes-bsp/ppa/ppa_git.bb b/recipes-bsp/ppa/ppa_git.bb
index 7f758fd63..98263beee 100644
--- a/recipes-bsp/ppa/ppa_git.bb
+++ b/recipes-bsp/ppa/ppa_git.bb
@@ -11,7 +11,23 @@ SRCREV = "9fcb080dd7415927aa3fbabfcba8982bcb1466d3"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "CC64="${CC}" LD64="${LD}"  OBJ64="${OBJCOPY}""
+python () {
+    ml = d.getVar("MULTILIB_VARIANTS", True)
+    arch = d.getVar("OVERRIDES", True)
+    if "fsl-lsch2-32b:" in arch:
+        if not "lib64" in ml:
+            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
+        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
+        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
+        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
+        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
+}
+
+WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
+EXTRA_OEMAKE = 'CC64="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" LD64="${WRAP_TARGET_PREFIX}ld ${TOOLCHAIN_OPTIONS}"  OBJ64="${WRAP_TARGET_PREFIX}objcopy"'
 
 PPA_PATH ?= "ppa/soc-ls1043/platform-rdb"
 PPA_PATH_ls1046a = "ppa/soc-ls1046/platform-rdb"