[meta-xilinx 1/7] tune-ppc440: Reorder tune features.

[meta-xilinx 1/7] tune-ppc440: Reorder tune features.

[Elvis Dowson]

* Minor change to reorder the tune features.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 conf/machine/include/tune-ppc440.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
index 35e93e9..699dfc9 100644
--- a/conf/machine/include/tune-ppc440.inc
+++ b/conf/machine/include/tune-ppc440.inc
@@ -6,7 +6,7 @@ TUNEVALID[ppc440] = "Enable ppc440 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc440", "-mcpu=440", "", d)}"
 
 AVAILTUNES += "ppc440"
-TUNE_FEATURES_tune-ppc440 = "m32 fpu-soft ppc440"
+TUNE_FEATURES_tune-ppc440 = "m32 ppc440 fpu-soft"
 TUNE_PKGARCH_tune-ppc440 = "ppc440"
 PACKAGE_EXTRA_ARCHS_tune-ppc440 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppc440"
 
-- 
1.7.9.5

[meta-xilinx 2/7] tune-ppc405: Add glibc configure options.

[Elvis Dowson]

* Add glibc configure options to get ppc405 specific library.
* Minor changes to tune-ppc405 recipe to specify soft-float option.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 conf/machine/include/tune-ppc405.inc |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc
index 012390e..b148956 100644
--- a/conf/machine/include/tune-ppc405.inc
+++ b/conf/machine/include/tune-ppc405.inc
@@ -4,11 +4,11 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppc405] = "Enable ppc405 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc405", "-mcpu=405", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc405", "ppc405", "${PPCPKGARCH}", d)}"
 
-TARGET_FPU = "soft"
 AVAILTUNES += "ppc405"
-TUNE_FEATURES_tune-ppc405 = "m32 ppc405"
-PACKAGE_EXTRA_ARCHS_tune-ppc405 = "ppc405"
+TUNE_FEATURES_tune-ppc405 = "m32 ppc405 fpu-soft"
+TUNE_PKGARCH_tune-ppc440 = "ppc405"
+PACKAGE_EXTRA_ARCHS_tune-ppc405 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppc405"
 
-#MACHINEOVERRIDES .= "ppc405"
+# glibc configure options to get ppc440 specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc405", "-with-cpu=405", "", d)}"
-- 
1.7.9.5

[meta-xilinx 3/7] tune-ppc405e: Add tune-ppc405e file.

[Elvis Dowson]

* Tune option for ppc405e with hard-float.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 conf/machine/include/tune-ppc405e.inc |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 conf/machine/include/tune-ppc405e.inc

diff --git a/conf/machine/include/tune-ppc405e.inc b/conf/machine/include/tune-ppc405e.inc
new file mode 100644
index 0000000..63e5e9c
--- /dev/null
+++ b/conf/machine/include/tune-ppc405e.inc
@@ -0,0 +1,14 @@
+DEFAULTTUNE ?= "ppc405e"
+
+require conf/machine/include/powerpc/arch-powerpc.inc
+
+TUNEVALID[ppc405e] = "Enable ppc405e specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc405e", "-mcpu=405fp", "", d)}"
+
+AVAILTUNES += "ppc405e"
+TUNE_FEATURES_tune-ppc405e = "m32 ppc405e fpu-hard"
+TUNE_PKGARCH_tune-ppc440e = "ppc405e"
+PACKAGE_EXTRA_ARCHS_tune-ppc405e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc405e"
+
+# glibc configure options to get ppc405e specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc405e", "-with-cpu=405fp", "", d)}"
-- 
1.7.9.5

[meta-xilinx 4/7] tune-ppc440e: Add tune-ppc440e file.

[Elvis Dowson]

* Tune option for ppc440e with hard-float.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 conf/machine/include/tune-ppc440e.inc |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 conf/machine/include/tune-ppc440e.inc

diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc
new file mode 100644
index 0000000..1769e05
--- /dev/null
+++ b/conf/machine/include/tune-ppc440e.inc
@@ -0,0 +1,14 @@
+DEFAULTTUNE ?= "ppc440e"
+
+require conf/machine/include/powerpc/arch-powerpc.inc
+
+TUNEVALID[ppc440e] = "Enable ppc440e specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc440e", "-mcpu=440fp", "", d)}"
+
+AVAILTUNES += "ppc440e"
+TUNE_FEATURES_tune-ppc440e = "m32 ppc440e fpu-hard"
+TUNE_PKGARCH_tune-ppc440e = "ppc440e"
+PACKAGE_EXTRA_ARCHS_tune-ppc440e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc440e"
+
+# glibc configure options to get ppc440e specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc440e", "-with-cpu=440fp", "", d)}"
-- 
1.7.9.5

[meta-xilinx 5/7] xilinx-boot.bbclass: Add support for selecting the xilinx hardware bitstream file.

[Elvis Dowson]

* Remove hard-coded references to the xilinx hardware bitstream file, and
  allow selection via a variable XILINX_BITSTREAM_FILE .

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 classes/xilinx-boot.bbclass |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/xilinx-boot.bbclass b/classes/xilinx-boot.bbclass
index 85fb6d9..871f82a 100644
--- a/classes/xilinx-boot.bbclass
+++ b/classes/xilinx-boot.bbclass
@@ -104,7 +104,9 @@ fi
 # For Xilinx EDK 13.1 Bootloop is set by default
 #
 cd ${XILINX_BSP_PATH}
-if [ ! -f implementation/download.bit ]; then
+#XILINX_BITSTREAM_FILE=implementation/download.bit
+XILINX_BITSTREAM_FILE=implementation/system.bit
+if [ ! -f ${XILINX_BITSTREAM_FILE} ]; then
 	# Bitstream not found generate it
 	bbnote "bitstream not found, generating it"
 	make -f ${XILINX_BSP_PATH}/system.make init_bram
@@ -114,7 +116,7 @@ if [ "${TARGET_ARCH}" = "powerpc" ]; then
 	# Find u-boot start address
 	start_address=`${TARGET_PREFIX}objdump -x u-boot | grep -w "start address" | cut -d ' ' -f3`
 	# Generate ACE image
-	xmd -tcl genace.tcl -hw implementation/download.bit -elf u-boot \
+	xmd -tcl genace.tcl -hw ${XILINX_BITSTREAM_FILE} -elf u-boot \
 	-target ppc_hw -start_address ${start_address} -ace u-boot-${XILINX_BOARD}.ace \
 	-board ${XILINX_BOARD}
 fi
-- 
1.7.9.5

[meta-xilinx 6/7] conf: Add bblayers.conf sample configuration file.

[Elvis Dowson]

* Add bblayers.conf sample configuration file to build meta-xilinx
  using gcc-4.5 and eglibc-2.13 retired toolchain recipes from
  the meta-openembedded/toolchain-layer.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 conf/bblayers.conf.sample |   13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 conf/bblayers.conf.sample

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
new file mode 100644
index 0000000..78cc933
--- /dev/null
+++ b/conf/bblayers.conf.sample
@@ -0,0 +1,13 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "5"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  /tool/yocto/poky/meta \
+  /tool/yocto/poky/meta-yocto \
+  /tool/yocto/meta-xilinx \
+  /tool/yocto/meta-openembedded/toolchain-layer \
+  "
-- 
1.7.9.5

[meta-xilinx 7/7] conf: Add local.conf sample configuration file.

[Elvis Dowson]

* Add local.conf sample configuration file to build meta-xilinx
  using gcc-4.5 and eglibc-2.13 retired toolchain recipes from
  the meta-openembedded/toolchain-layer, for the Xilinx ML507 development
  board using the Virtex-5 PowerPC 440 processor.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 conf/local.conf.sample |  300 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 300 insertions(+)
 create mode 100644 conf/local.conf.sample

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
new file mode 100644
index 0000000..6c4ed95
--- /dev/null
+++ b/conf/local.conf.sample
@@ -0,0 +1,300 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended 
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the 
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Parallelism Options
+#
+# These two options control how much parallelism BitBake should use. The first 
+# option determines how many tasks bitbake should run in parallel:
+#
+BB_NUMBER_THREADS = "8"
+# 
+# The second option controls how many processes make should run in parallel when
+# running compile tasks:
+#
+PARALLEL_MAKE = "-j 8"
+#
+# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
+# be appropriate for example.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "atom-pc"
+#MACHINE ?= "beagleboard"
+#MACHINE ?= "mpc8315e-rdb"
+#MACHINE ?= "routerstationpro"
+#MACHINE ?= "overo-fire-chestnut43"
+#
+#
+# This sets the default machine to be qemux86 if no other machine is selected:
+# MACHINE ??= "qemux86"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "poky"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends 
+# can be enabled at once and the first item listed in the variable will be used 
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to ipk for embedded targets:
+PACKAGE_CLASSES ?= "package_ipk"
+
+#
+# SDK/ADT target architecture
+#
+# This variable specified the architecture to build SDK/ADT items for and means
+# you can build the SDK packages for architectures other than the machine you are 
+# running the build on (i.e. building i686 packages on an x86_64 host._
+# Supported values are i686 and x86_64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated 
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng valgrind (x86 only))
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable 
+# are:
+#   - 'buildstats' collect build statistics
+#   - 'image-mklibs' to reduce shared library files size for an image
+#   - 'image-prelink' in order to prelink the filesystem image
+#   - 'image-swab' to perform host system intrusion detection
+# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+#USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+# Add image-mklibs image-prelink for PowerPC 32-bit and 64-bit targets.
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. To
+# enable this uncomment this line
+#IMAGETEST = "qemu"
+#
+# This variable controls which tests are run against virtual images if enabled
+# above. The following would enable bat, boot the test case under the sanity suite
+# and perform toolchain tests
+#TEST_SCEN = "sanity bat sanity:boot toolchain"
+#
+# Because of the QEMU booting slowness issue (see bug #646 and #618), the
+# autobuilder may suffer a timeout issue when running sanity tests. We introduce
+# the variable TEST_SERIALIZE here to reduce the time taken by the sanity tests.
+# It is set to 1 by default, which will boot the image and run cases in the same
+# image without rebooting or killing the machine instance. If it is set to 0, the
+# image will be copied and tested for each case, which will take longer but be
+# more precise.
+#TEST_SERIALIZE = "1"
+
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it 
+# can launch an interactive shell. It needs to do this since the build is 
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can 
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other 
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the 
+# cache locations to check for the shared objects.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/ \n \
+#file://.* file:///some/local/dir/sstate/"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "1"
+
+#
+# MIRRORS/PREMIRRORS locations.
+#
+# Add the PREMIRRORS statement to the configuration file, so that local directories
+# are first checked for existing tarballs before running out to the net.
+#PREMIRRORS_prepend = "\
+#     git://.*/.* file:///pub/scm/repositories/ \n \
+#     git://.*/.* file:///pub/scm/repositories/kernel \n \
+#     "
+
+# Set the external toolchain.
+#TCMODE = "external-sourcery-rebuild-libc"
+#EXTERNAL_TOOLCHAIN = "/tool/mentor/csl-2012.03.71"
+#NO32LIBS = "0"
+#CSL_VER_MAIN_powerpc = "2012.03-71"
+#CSL_TARGET_SYS_powerpc = "powerpc-mentor-linux-gnu"
+
+#PREFERRED_PROVIDER_linux-libc-headers = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_eglibc = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_gdbserver = "external-sourcery-toolchain"
+#PREFERRED_PROVIDER_virtual/gettext = "gettext"
+
+# Set the gcc toolchain version.
+# Use wildcards %, to match the actual versions.
+GCCVERSION = "4.5%"
+SDKGCCVERSION = "${GCCVERSION}"
+BINUVERSION = "2.22"
+EGLIBCVERSION = "2.13"
+UCLIBCVERSION = "0.9.33"
+LINUXLIBCVERSION = "3.3"
+
+# Set the default serial console
+KERNEL_CONSOLE = "ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#
+# Xilinx ISE Design Tools
+#
+# Set Xilinx tools installation path
+XILINX_LOC ?= "/tool/xilinx/14.2/ISE_DS"
+# Set Xilinx EDK installation path
+#XILINX_EDK ?= "${XILINX_LOC}/EDK"
+
+#
+# Xilinx target board configuration.
+# 
+# Set the target machine details
+MACHINE ?= "virtex5"
+#MACHINE ?= "qemuppc"
+# Set the target board details
+XILINX_BOARD ?= "ml507"
+
+#
+# Set Xilinx Platform Studio hardware project path
+#
+# Set Xilinx BSP path
+XILINX_BSP_PATH ?= "/project/xilinx-ml507-xps-14.2-aalonso"
+
-- 
1.7.9.5