Re: [meta-xilinx] [PATCH 4/7] xilinx-bootbin: convert to a normal recipe
> On Jul 6, 2017, at 13:16, Jean-Francois Dagenais
> wrote:
>
> +addtask do_deploy before do_build after do_compile
> +
> +#do_build[depends] += "${PN}:do_deploy"
> --
> 2.1.4
>
Sorry, left a commented line in there.
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 6/7] xsctbase: rebuild all products when XILINX_VER_MAIN changes
When we update the tools, it's natural to expect all those recipes using
these tools to spontaneously rebuild.
Signed-off-by: Jean-Francois Dagenais
---
classes/xsctbase.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/classes/xsctbase.bbclass b/classes/xsctbase.bbclass
index fac7b8f..0aaf9c4 100644
--- a/classes/xsctbase.bbclass
+++ b/classes/xsctbase.bbclass
@@ -21,6 +21,7 @@ XSCTH_ARCH ?= "${@bb.utils.contains('XSCTH_PROC',
'psu_cortexa53_0', '64', '32',
PROJ_ARG ??= "-ws ${XSCTH_WS} -pname ${XSCTH_PROJ} -rp ${XSCTH_REPO}"
HW_ARG ??= "-processor ${XSCTH_PROC} -hdf ${XSCTH_HDF} -arch ${XSCTH_ARCH}"
+do_configure[vardeps] += "XILINX_VER_MAIN"
do_configure[depends] += "virtual/hdf:do_deploy"
do_configure[lockfiles] = "${TMPDIR}/xsct-invoke.lock"
do_configure() {
--
2.1.4
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 7/7] layer.conf: define default XILINX_VER_MAIN here
This way it is visible to all code within the build.
Otherwize, recipes inheriting only xsct-tc would not get any definition
other than one found in a local.conf or equivalent, preventing the users
from using XILINX_VER_MAIN in their definition of XILINX_SDK_TOOLCHAIN.
It also makes sense that if one checks out "rel-v2017.2", the layer just
works with this assumption.
Signed-off-by: Jean-Francois Dagenais
---
classes/xsctbase.bbclass | 2 --
conf/layer.conf | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/classes/xsctbase.bbclass b/classes/xsctbase.bbclass
index 0aaf9c4..60898c8 100644
--- a/classes/xsctbase.bbclass
+++ b/classes/xsctbase.bbclass
@@ -1,5 +1,3 @@
-XILINX_VER_MAIN ??= "2017.2"
-
inherit xsct-tc
B = "${WORKDIR}/build"
diff --git a/conf/layer.conf b/conf/layer.conf
index 48b57fc..ce5331f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,3 +15,4 @@ LAYERDEPENDS_xilinx-tools = "core"
XLNX_SCRIPTS_DIR = "${LAYERDIR}/scripts/"
+XILINX_VER_MAIN ??= "2017.2"
--
2.1.4
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 4/7] xilinx-bootbin: convert to a normal recipe
The BOOT.bin product cannot be made by a task attached to every image
recipe like it is now because it means that each image recipe built,
wheather sequencially or in parallel, will compete to overwrite the
same BOOT.bin file in the DEPLOY_DIR_IMAGE directory.
Plus, doing the boot.bin while making an initramfs makes no sense.
Instead, the BOOT.bin product as a recipe on it's own, will behave
better in the yocto build system.
The recipe can be triggered through normal depencency at machine level,
or as part of image_types dependencies, etc.
For a wic made sdcard image, something like this works well at the:
machine scope:
do_image_wic[depends] += "\
xilinx-bootbin:do_deploy \
"
IMAGE_BOOT_FILES = "\
BOOT.bin \
...
"
Signed-off-by: Jean-Francois Dagenais
---
classes/xilinx-bootbin.bbclass | 83 ---
conf/machine/include/machine-xilinx-zynqmp.inc | 2 -
recipes-bsp/bootbin/xilinx-bootbin_1.0.bb | 105 +
3 files changed, 105 insertions(+), 85 deletions(-)
delete mode 100644 classes/xilinx-bootbin.bbclass
create mode 100644 recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
diff --git a/classes/xilinx-bootbin.bbclass b/classes/xilinx-bootbin.bbclass
deleted file mode 100644
index db2235b..000
--- a/classes/xilinx-bootbin.bbclass
+++ /dev/null
@@ -1,83 +0,0 @@
-inherit xsct-tc
-
-BIF_COMMON_ATTR ?= ''
-BIF_PARTITION_ATTR ?= ''
-BIF_PARTITION_IMAGE ?= ''
-BIF_PARTITION_DEPENDS ?= ''
-BIF_FILE_PATH = "${WORKDIR}/bootgen.bif"
-
-def create_bif(config, attrflags, attrimage, common_attr, biffd, d):
-import re, os
-for cfg in config:
-if cfg not in attrflags and common_attr:
-error_msg = "%s: invalid ATTRIBUTE" % (cfg)
-bb.error("BIF attribute Error: %s " % (error_msg))
-else:
-if common_attr:
-cfgval = attrflags[cfg].split(',')
-cfgstr = "\t [%s] %s\n" % (cfg,', '.join(cfgval))
-else:
-if cfg not in attrimage:
-error_msg = "%s: invalid or missing elf or image" % (cfg)
-bb.error("BIF atrribute Error: %s " % (error_msg))
-imagestr = d.expand(attrimage[cfg])
-if os.stat(imagestr).st_size == 0:
-bb.warn("Empty file %s, excluding from bif file"
%(imagestr))
-continue
-if cfg in attrflags:
-cfgval = attrflags[cfg].split(',')
-cfgstr = "\t [%s] %s\n" % (', '.join(cfgval), imagestr)
-else:
-cfgstr = "\t %s\n" % (imagestr)
-biffd.write(cfgstr)
-
-return
-
-python do_create_bif() {
-
-fp = d.getVar("BIF_FILE_PATH", True)
-biffd = open(fp, 'w')
-biffd.write("the_ROM_image:\n")
-biffd.write("{\n")
-
-bifattr = (d.getVar("BIF_COMMON_ATTR", True) or "").split()
-if bifattr:
-attrflags = d.getVarFlags("BIF_COMMON_ATTR") or {}
-create_bif(bifattr, attrflags,'', 1, biffd, d)
-
-bifpartition = (d.getVar("BIF_PARTITION_ATTR", True) or "").split()
-if bifpartition:
-attrflags = d.getVarFlags("BIF_PARTITION_ATTR") or {}
-attrimage = d.getVarFlags("BIF_PARTITION_IMAGE") or {}
-create_bif(bifpartition, attrflags, attrimage, 0, biffd, d)
-
-biffd.write("}")
-biffd.close()
-}
-addtask do_create_bif after do_image_complete before do_xilinx_bootbin
-
-do_create_bif[vardeps] += "BIF_PARTITION_ATTR BIF_PARTITION_IMAGE
BIF_COMMON_ATTR"
-do_create_bif[depends] += "${@get_bootbin_depends(d)}"
-
-def get_bootbin_depends(d):
-bootbindeps = ""
-bifpartition = (d.getVar("BIF_PARTITION_ATTR", True) or "").split()
-attrdepends = d.getVarFlags("BIF_PARTITION_DEPENDS") or {}
-for cfg in bifpartition:
-if cfg in attrdepends:
-bootbindeps = bootbindeps + " " + attrdepends[cfg] + ":do_deploy"
-
-return bootbindeps
-
-do_xilinx_bootbin[depends] += "${@get_bootbin_depends(d)}"
-
-do_xilinx_bootbin () {
-cd ${WORKDIR}
-rm -f BOOT.bin
-bootgen -image ${BIF_FILE_PATH} -arch ${KMACHINE} -w -o BOOT.bin
-if [ ! -e BOOT.bin ]; then
-bbfatal "bootgen failed. See log"
-fi
-install -m 0644 BOOT.bin ${DEPLOY_DIR_IMAGE}/BOOT.bin
-}
-addtask do_xilinx_bootbin after do_image_complete before do_build
diff --git a/conf/machine/include/machine-xilinx-zynqmp.inc
b/conf/machine/include/machine-xilinx-zynqmp.inc
index c620813..5357741 100644
--- a/conf/machine/include/machine-xilinx-zynqmp.inc
+++ b/conf/machine/include/machine-xilinx-zynqmp.inc
@@ -1,5 +1,3 @@
-# add Boot.bin dependency
-IMAGE_CLASSES_append ?= " xilinx-bootbin"
# specify BIF common attribute for FSBL
BIF_COMMON_ATTR ?= "fsbl_config"
diff --git a/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
b/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
new file mode 100644
index 000..2aca94e
--- /dev/null
+++ b/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -0,0 +1,
[meta-xilinx] [PATCH 5/7] xsctyaml: explicitely wait for do_prepare_recipy_sysroot before create_yaml
This is an attempt at fixing a rare/irreproducible do_create_yaml
failure where hard link creation are failing.
Signed-off-by: Jean-Francois Dagenais
---
classes/xsctyaml.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/classes/xsctyaml.bbclass b/classes/xsctyaml.bbclass
index fd9b9db..17a7e8e 100644
--- a/classes/xsctyaml.bbclass
+++ b/classes/xsctyaml.bbclass
@@ -77,4 +77,4 @@ python do_create_yaml() {
yamlfile.write(yaml.dump(yaml_dict, default_flow_style=True,
width=2000))
}
-addtask create_yaml before do_configure
+addtask create_yaml before do_configure after do_prepare_recipe_sysroot
--
2.1.4
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 2/7] README: improve layer requirements info
The previous wording implies that the working shell's PATH must contain
the SDK's path, which is not the case. The layer's classes add the
proper SDK bin dir to the PATH at tool invokation.
Also clarify things about the XILINX_VER_MAIN and XILINX_SDK_TOOLCHAIN
variables.
Signed-off-by: Jean-Francois Dagenais
---
README.md | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 30616ed..2acd4aa 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,15 @@ Dependencies
This layer depends on:
-XSCT being installed in your path
+XSCT being installed somewhere the yocto build can access. You must define
+this path by specifying the XILINX_SDK_TOOLCHAIN variable globally, typically
+in your local.conf (or site.conf).
-Define the PATH using the variable XILINX_SDK_TOOLCHAIN
-The supported tool version is indicated in XILINX_VER_MAIN
+The supported tool version is indicated in XILINX_VER_MAIN which defaults to
+the current release that is checked out.
+
+It would be wise then to define XILINX_SDK_TOOLCHAIN like so:
+XILINX_SDK_TOOLCHAIN = "/full/path/to/xilinx/SDK/${XILINX_VER_MAIN}"
Each release is dependent on the Xilinx XSCT release version. Please note that
xsct tools may not be backward compatible with embeddedsw repo. Meaning
--
2.1.4
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 3/7] xsct-tc: append the local system's /usr/bin dir as Xvfb fallback
See changes to README.md.
Essentially, we need to fallback to locally found Xvfb and xlsclients
since the xserver-xorg recipe won't build without "x11" in
DISTRO_FEATURE.
Signed-off-by: Jean-Francois Dagenais
---
README.md | 9 -
classes/xsct-tc.bbclass | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2acd4aa..057923a 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,14 @@ Dependencies
This layer depends on:
-XSCT being installed somewhere the yocto build can access. You must define
+* **If you don't have "x11" in your DISTRO_FEATURES, you'll need
+`xlsclients` and `Xvfb` to satisfy the SDK's dependence on it. You may install
+these by `apt-get install -y xvfb x11-utils` or the like. Note that if your
+system distro doesn't install those in /usr/bin, you'll need to provide links
+for them in /usr/bin since xsct (from the SDK itself) not only depends on these
+but it actually assumes /usr/bin.
+
+* XSCT being installed somewhere the yocto build can access. You must define
this path by specifying the XILINX_SDK_TOOLCHAIN variable globally, typically
in your local.conf (or site.conf).
diff --git a/classes/xsct-tc.bbclass b/classes/xsct-tc.bbclass
index 937fbd2..f124919 100644
--- a/classes/xsct-tc.bbclass
+++ b/classes/xsct-tc.bbclass
@@ -1,5 +1,6 @@
XSCT_PATH_ADD = "${XILINX_SDK_TOOLCHAIN}/bin:"
PATH =. "${XSCT_PATH_ADD}"
+PATH_append = ":/usr/bin"
def xsct_run(d):
import bb.process
--
2.1.4
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 1/7] xsctbase.bbclass: Add check for xsct compile failure
From: Manjukumar Matha
Check for executable to be present after xsct project compilation.
If the executable is not preset, report error
Signed-off-by: Manjukumar Matha
Signed-off-by: Jean-Francois Dagenais
---
classes/xsctbase.bbclass | 4
1 file changed, 4 insertions(+)
diff --git a/classes/xsctbase.bbclass b/classes/xsctbase.bbclass
index 98dafde..fac7b8f 100644
--- a/classes/xsctbase.bbclass
+++ b/classes/xsctbase.bbclass
@@ -15,6 +15,7 @@ XSCTH_PROJ ??= "${PN}"
XSCTH_WS ??= "${B}"
XSCTH_MISC ??= ""
XSCTH_SCRIPT ??= ""
+XSCTH_EXECUTABLE ??= ""
XSCTH_ARCH ?= "${@bb.utils.contains('XSCTH_PROC', 'psu_cortexa53_0', '64',
'32', d)}"
PROJ_ARG ??= "-ws ${XSCTH_WS} -pname ${XSCTH_PROJ} -rp ${XSCTH_REPO}"
@@ -55,4 +56,7 @@ do_compile() {
export RDI_PLATFORM=ln64
export SWT_GTK3=0
eval xsct ${XSCTH_SCRIPT} ${PROJ_ARG} -do_compile 1
+if [ ! -e ${XSCTH_WS}/${XSCTH_PROJ}/${XSCTH_EXECUTABLE} ]; then
+bbfatal_log "${PN} compile failed."
+fi
}
--
2.1.4
--
___
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] meta: introduce bigendian instead of little-endian/big-endian
> This looks ok. Just out of query is there a reason for this change apart
from lining up with oe-core?
Yes, there is a reason, I am now working on a patch refactoring
linuxloader.bbclass for musl libc in OE(not sent to mail list yet), in
which I need query microblaze TUNE_FEATURES for endianness, I prefer to
query "bigendian" like all other architectures are doing, that's why I made
this patch.
//Ming Liu
2017-07-06 7:22 GMT+02:00 Nathan Rossi :
> On 6 July 2017 at 12:02, wrote:
> > From: Ming Liu
> >
> > The endianess of a specific architecture could be either big or little,
> > there is not a third value, so let it default to be little endian, and
> > get rid of the tune feature 'little-endian' which is redundant to be
> > there, also change tune feature 'big-endian' to 'bigendian'.
> >
> > With these changes, it will behave same with all other architectures in
> > openembedded-core layer.
>
> This looks ok. Just out of query is there a reason for this change
> apart from lining up with oe-core?
>
> On a side note, I am working towards getting these microblaze tunes
> included in oe-core so this will be included in that.
>
> >
> > Signed-off-by: Ming Liu
> > ---
> > classes/zynqmp-pmu.bbclass | 2 +-
> > conf/machine/include/microblaze/arch-microblaze.inc | 12
>
> > .../include/microblaze/feature-microblaze-versions.inc | 2 +-
> > conf/machine/kc705-microblazeel.conf | 2 +-
> > conf/machine/ml605-qemu-microblazeel.conf| 2 +-
> > conf/machine/s3adsp1800-qemu-microblazeeb.conf | 2 +-
> > 6 files changed, 9 insertions(+), 13 deletions(-)
> >
> > diff --git a/classes/zynqmp-pmu.bbclass b/classes/zynqmp-pmu.bbclass
> > index 7291344..3ebe488 100644
> > --- a/classes/zynqmp-pmu.bbclass
> > +++ b/classes/zynqmp-pmu.bbclass
> > @@ -18,7 +18,7 @@ ORIG_TARGET_ARCH := "${TARGET_ARCH}"
> > # zynqmp-pmu target arch (hardcoded based on pre-gen data from
> arch-microblaze.inc)
> > ABIEXTENSION = ""
> > TUNE_ARCH = "microblazeel"
> > -#TUNE_FEATURES_tune-microblaze += "v9.2 little-endian barrel-shift
> pattern-compare"
> > +#TUNE_FEATURES_tune-microblaze += "v9.2 barrel-shift pattern-compare"
> > TUNE_CCARGS = "-mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
> -mno-xl-reorder -mcpu=v9.2 -mxl-soft-mul -mxl-soft-div"
> > TUNE_LDARGS = ""
> > TUNE_ASARGS = ""
> > diff --git a/conf/machine/include/microblaze/arch-microblaze.inc
> b/conf/machine/include/microblaze/arch-microblaze.inc
> > index b01f03b..27f776c 100644
> > --- a/conf/machine/include/microblaze/arch-microblaze.inc
> > +++ b/conf/machine/include/microblaze/arch-microblaze.inc
> > @@ -5,15 +5,11 @@ TUNEVALID[microblaze] = "MicroBlaze"
> > MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES",
> "microblaze", "microblaze:", "" ,d)}"
> >
> > # Endian
> > -TUNEVALID[big-endian] = "Use Microblaze Big Endian."
> > -TUNECONFLICTS[big-endian] = "little-endian"
> > -TUNEVALID[little-endian] = "Use Microblaze Little Endian."
> > -TUNECONFLICTS[little-endian] = "big-endian"
> > +TUNEVALID[bigendian] = "Use Microblaze Big Endian."
> >
> > -MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES",
> "little-endian", "el", "eb" ,d)}"
> > +MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian",
> "eb", "el" ,d)}"
> >
> > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "big-endian",
> "-mbig-endian", "" ,d)}"
> > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "little-endian",
> "-mlittle-endian", "" ,d)}"
> > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian",
> "-mbig-endian", "-mlittle-endian" ,d)}"
> >
> > # General features
> > TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter"
> > @@ -42,7 +38,7 @@ require conf/machine/include/
> microblaze/feature-microblaze-versions.inc
> > require conf/machine/include/microblaze/feature-microblaze-math.inc
> >
> > # Architecture name, either 'microblazeeb' or 'microblazeel' depending
> on endianess
> > -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES",
> "little-endian", "el", "eb" ,d)}"
> > +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES",
> "bigendian", "eb", "el" ,d)}"
> >
> > # Package Architecture formatting
> > TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${
> MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
> > diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc
> b/conf/machine/include/microblaze/feature-microblaze-versions.inc
> > index 7e9aa95..4a2b4f4 100644
> > --- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
> > +++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc
> > @@ -69,7 +69,7 @@ TUNECONFLICTS[v9.6] :=
> > "${@microblaze_version_conflict('v9.6',
> d)}"
> > TUNECONFLICTS[v10.0] := "${@microblaze_version_conflict('v10.0', d)}"
> >
> > # Version/feature conflicts
> > -TUNECONFLICTS[v7.30] += "reorder little-endian
[meta-xilinx] [PATCH] meta: introduce bigendian instead of little-endian/big-endian
From: Ming Liu
The endianess of a specific architecture could be either big or little,
there is not a third value, so let it default to be little endian, and
get rid of the tune feature 'little-endian' which is redundant to be
there, also change tune feature 'big-endian' to 'bigendian'.
With these changes, it will behave same with all other architectures in
openembedded-core layer.
Signed-off-by: Ming Liu
---
classes/zynqmp-pmu.bbclass | 2 +-
conf/machine/include/microblaze/arch-microblaze.inc | 12
.../include/microblaze/feature-microblaze-versions.inc | 2 +-
conf/machine/kc705-microblazeel.conf | 2 +-
conf/machine/ml605-qemu-microblazeel.conf| 2 +-
conf/machine/s3adsp1800-qemu-microblazeeb.conf | 2 +-
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/classes/zynqmp-pmu.bbclass b/classes/zynqmp-pmu.bbclass
index 7291344..3ebe488 100644
--- a/classes/zynqmp-pmu.bbclass
+++ b/classes/zynqmp-pmu.bbclass
@@ -18,7 +18,7 @@ ORIG_TARGET_ARCH := "${TARGET_ARCH}"
# zynqmp-pmu target arch (hardcoded based on pre-gen data from
arch-microblaze.inc)
ABIEXTENSION = ""
TUNE_ARCH = "microblazeel"
-#TUNE_FEATURES_tune-microblaze += "v9.2 little-endian barrel-shift
pattern-compare"
+#TUNE_FEATURES_tune-microblaze += "v9.2 barrel-shift pattern-compare"
TUNE_CCARGS = "-mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-mno-xl-reorder -mcpu=v9.2 -mxl-soft-mul -mxl-soft-div"
TUNE_LDARGS = ""
TUNE_ASARGS = ""
diff --git a/conf/machine/include/microblaze/arch-microblaze.inc
b/conf/machine/include/microblaze/arch-microblaze.inc
index b01f03b..27f776c 100644
--- a/conf/machine/include/microblaze/arch-microblaze.inc
+++ b/conf/machine/include/microblaze/arch-microblaze.inc
@@ -5,15 +5,11 @@ TUNEVALID[microblaze] = "MicroBlaze"
MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze",
"microblaze:", "" ,d)}"
# Endian
-TUNEVALID[big-endian] = "Use Microblaze Big Endian."
-TUNECONFLICTS[big-endian] = "little-endian"
-TUNEVALID[little-endian] = "Use Microblaze Little Endian."
-TUNECONFLICTS[little-endian] = "big-endian"
+TUNEVALID[bigendian] = "Use Microblaze Big Endian."
-MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "little-endian",
"el", "eb" ,d)}"
+MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb",
"el" ,d)}"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "big-endian",
"-mbig-endian", "" ,d)}"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "little-endian",
"-mlittle-endian", "" ,d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian",
"-mbig-endian", "-mlittle-endian" ,d)}"
# General features
TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter"
@@ -42,7 +38,7 @@ require
conf/machine/include/microblaze/feature-microblaze-versions.inc
require conf/machine/include/microblaze/feature-microblaze-math.inc
# Architecture name, either 'microblazeeb' or 'microblazeel' depending on
endianess
-TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "little-endian",
"el", "eb" ,d)}"
+TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian",
"eb", "el" ,d)}"
# Package Architecture formatting
TUNE_PKGARCH =
"microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc
b/conf/machine/include/microblaze/feature-microblaze-versions.inc
index 7e9aa95..4a2b4f4 100644
--- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc
@@ -69,7 +69,7 @@ TUNECONFLICTS[v9.6] :=
"${@microblaze_version_conflict('v9.6', d)}"
TUNECONFLICTS[v10.0] := "${@microblaze_version_conflict('v10.0', d)}"
# Version/feature conflicts
-TUNECONFLICTS[v7.30] += "reorder little-endian"
+TUNECONFLICTS[v7.30] += "reorder"
TUNECONFLICTS[v8.00] += "reorder"
TUNECONFLICTS[v8.10] += "reorder"
TUNECONFLICTS[v8.20] += "reorder"
diff --git a/conf/machine/kc705-microblazeel.conf
b/conf/machine/kc705-microblazeel.conf
index 736880f..39cb3c2 100644
--- a/conf/machine/kc705-microblazeel.conf
+++ b/conf/machine/kc705-microblazeel.conf
@@ -7,7 +7,7 @@ require conf/machine/include/tune-microblaze.inc
require conf/machine/include/machine-xilinx-default.inc
require conf/machine/include/machine-xilinx-board.inc
-TUNE_FEATURES_tune-microblaze += "v9.6 little-endian barrel-shift
pattern-compare multiply-high"
+TUNE_FEATURES_tune-microblaze += "v9.6 barrel-shift pattern-compare
multiply-high"
MACHINE_FEATURES = ""
diff --git a/conf/machine/ml605-qemu-microblazeel.conf
b/conf/machine/ml605-qemu-microblazeel.conf
index 731f26f..2092801 100644
--- a/conf/machine/ml605-qemu-microblazeel.conf
+++ b/conf/machine/ml605-qemu-microblazeel.conf
@@ -6,7 +6,7 @@ require conf/machine/include/tune-microblaze.inc
req
