xilinx-standalone: switch override and append

Instead of overriding the append, we need to append the override.

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>

4 files changed, 12 insertions, 8 deletions

diff --git a/meta-xilinx-standalone/conf/machine/cortexa53.conf b/meta-xilinx-standalone/conf/machine/cortexa53.conf
index 1d8377ca..3e99cc50 100644
--- a/meta-xilinx-standalone/conf/machine/cortexa53.conf
+++ b/meta-xilinx-standalone/conf/machine/cortexa53.conf
@@ -35,7 +35,7 @@ GCC_CONFIGURE_A53 ?= " \
         --with-ppl=no \
 "
 
-EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${GCC_CONFIGURE_A53} \
 "
 
@@ -48,6 +48,6 @@ BINUTILS_CONFIGURE_A53 ?= " \
         --enable-static \
 "
 
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${BINUTILS_CONFIGURE_A53} \
 "
diff --git a/meta-xilinx-standalone/conf/machine/cortexa72.conf b/meta-xilinx-standalone/conf/machine/cortexa72.conf
index b2bcd0ec..c3acb6b3 100644
--- a/meta-xilinx-standalone/conf/machine/cortexa72.conf
+++ b/meta-xilinx-standalone/conf/machine/cortexa72.conf
@@ -36,7 +36,7 @@ GCC_CONFIGURE_A72 ?= " \
         --with-ppl=no \
 "
 
-EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${GCC_CONFIGURE_A72} \
 "
 
@@ -49,6 +49,6 @@ BINUTILS_CONFIGURE_A72 ?= " \
         --enable-static \
 "
 
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${BINUTILS_CONFIGURE_A72} \
 "
diff --git a/meta-xilinx-standalone/conf/machine/cortexr5.conf b/meta-xilinx-standalone/conf/machine/cortexr5.conf
index 74ef4b4d..db68f22f 100644
--- a/meta-xilinx-standalone/conf/machine/cortexr5.conf
+++ b/meta-xilinx-standalone/conf/machine/cortexr5.conf
@@ -32,7 +32,7 @@ GCC_CONFIGURE_R5 ?= " \
 "
 
 
-EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${GCC_CONFIGURE_R5} \
 "
 
@@ -42,7 +42,7 @@ BINUTILS_CONFIGURE_R5 ?= " \
         -enable-interwork \
 "
 
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${BINUTILS_CONFIGURE_R5} \
 "
 
diff --git a/meta-xilinx-standalone/conf/machine/zynqmp-pmu.conf b/meta-xilinx-standalone/conf/machine/zynqmp-pmu.conf
index 85b3315e..1af8dca9 100644
--- a/meta-xilinx-standalone/conf/machine/zynqmp-pmu.conf
+++ b/meta-xilinx-standalone/conf/machine/zynqmp-pmu.conf
@@ -20,12 +20,16 @@ GCC_CONFIGURE_MB ?= " \
         --with-isl=no \
         --with-ppl=no \
         --without-long-double-128 \
+        --disable-multilib \
 "
 
-EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${GCC_CONFIGURE_MB} \
 "
 
+EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append = " \
+        ${GCC_CONFIGURE_MB} \
+"
 
 BINUTILS_CONFIGURE_MB ?= " \
         --disable-initfini-array \
@@ -35,6 +39,6 @@ BINUTILS_CONFIGURE_MB ?= " \
         --enable-multilib \
 "
 
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_append_xilinx-standalone = " \
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append = " \
         ${BINUTILS_CONFIGURE_MB} \
 "
\ No newline at end of file