summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
Commit message (Collapse)AuthorAgeFilesLines
* qemuboot-xilinx.bbclass: Rework qemu-xilinx setupNathan Rossi2017-04-281-33/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change reworks how the meta-xilinx layer enables and provides the custom version of QEMU based on Xilinx's fork of QEMU. The existing implementation relied on the single sysroot which was changed in oe-core such that now recipes have their own sysroots (RSS support). Additionally oe-core now provides the QEMU binaries to the runqemu script via the 'qemu-helper-native' recipes sysroot as opposed to the image sysroot. These rework changes allow for a single machine to select the targeted QEMU version as well as to provide the qemuboot config specific to the targeted QEMU version. The selection of QEMU version is now handled by PREFERRED_PROVIDER mechanics with the meta-xilinx layer providing an additional recipe that is equivalent to qemu-helper-native and which also provides said target allowing for the machine to select via the use of PREFERRED_PROVIDER_qemu-helper-native. This recipe (qemu-xilinx-helper-native) however instead provides the sysroot populated with qemu-xilinx instead of qemu. Additionally the XILINX_QEMUBOOT variable is replaced with the qemuboot-xilinx.bbclass, this provides the overrides for setting up qemu-xilinx specific QB_* args. Additionally this bbclass points runqemu at the qemu-xilinx-helper-native sysroot for QEMU binaries. These changes also work towards making the meta-xilinx layer better handle multiple qemuboot.conf variants as well as handling different QEMU versions. This change also removes the 'qemu-system-xilinx' MACHINE_FEATURES, this is due to MACHINE_FEATURES no longer being available for native recipes. Additionally there is no longer any logic that needs to know this any way. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
* machine-xilinx-qemu.inc: Don't use MACHINE_DEVICETREE for dtb detectionNathan Rossi2017-04-261-7/+10
| | | | | | | | Avoid using the MACHINE_DEVICETREE variable for detection of the device tree that needs to be loaded. Instead only rely on IMAGE_BOOT_FILES or KERNEL_DEVICETREE. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Remove linux-yocto version pinningNathan Rossi2017-04-261-1/+0
| | | | | | | Use the newest available on targets that default to using linux-yocto. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Acked-by: Alistair Francis <alistair.francis@xilinx.com>
* arch-microblaze.inc: Consolidate MicroBlaze tune featuresNathan Rossi2017-03-3111-77/+77
| | | | | | | | | | | | | | | | This change adds the 'arch-microblaze.inc' architecture tune features include which provides all the relevant tune features for MicroBlaze. This include replaces the 'tune-microblaze-features.inc' include, which is not actually a valid TUNE. This change results in the MicroBlaze tune and tune feature include tree matching the layout of meta/. This change additionally consolidates all the smaller includes (feature-microblaze-*.inc) into larger sets or into the arch-microblaze.inc. This makes the package arch string ordering much clearer as well as removing the large number of variables uses to set the TUNE_CCARGS. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* feature-microblaze-versions.inc: Clean up and consolidationNathan Rossi2017-03-316-89/+106
| | | | | | | | | | | | Clean up the MicroBlaze versions tunes as well and improve the TUNECONFLICTS for version features so that the conflicts matrix is automatically generated. Additionally consolidate the version features into a single include. Improve and generate the "-mcpu=" and package strings based on the version feature. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Remove UBOOT_OFEMBED for UBOOT_BINARYNathan Rossi2017-03-091-5/+1
| | | | | | | | | Both u-boot-xlnx and u-boot (mainline) now agree on the name for the output binary which includes the dtb. Additionally both versions load 'u-boot.img' from SPL. The UBOOT_OFEMBED variable and conditional value setting are no longer needed. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* linux-xlnx: Update to the xilinx-v2016.4 releaseNathan Rossi2017-02-161-1/+1
| | | | | | | | | Update the linux-xlnx recipe to point at the xilinx-v2016.4 release. Note that this changes the naming convention for the .bb file, this has no affect on the value of PV since it is specific in the recipe itself. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zcu102-zynqmp: Default qemuboot to using Xilinx QEMUNathan Rossi2017-02-161-1/+1
| | | | | | | | | | Currently the mainline QEMU is lacking full support for emulating the ZCU102 board. So use the more functional Xilinx QEMU for this board. Also reformat some of the appends to QB_* variables for clarity. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
* machine-xilinx-qemu.inc: Add support for starting Xilinx's QEMUAlistair Francis2017-01-181-0/+33
| | | | | | | | This patch adds support to the general include file to boot Xilinx's QEMU machines. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Add XSERVERManjukumar Matha2016-12-021-0/+14
| | | | | | | Add X org X server configurations, armsoc driver for zynqmp Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* linux-xlnx_4.4: Drop this version it is supersededNathan Rossi2016-11-191-1/+1
| | | | | | | The v4.4/xilinx-v2016.2 version of the linux-xlnx kenrel is dropped in favour of the newer 4.6/xilinx-v2016.3 kernel. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* feature-microblaze-*: Add Microblaze v10.0 IPManjukumar Matha2016-11-022-9/+16
| | | | | | | Add v10.0 IP for microblaze Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Update default linux-yocto version to 4.8Nathan Rossi2016-10-111-1/+1
| | | | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Set UBOOT_OFEMBED for u-boot-xlnx-devNathan Rossi2016-10-111-1/+1
| | | | | | | The u-boot-xlnx-dev version of u-boot is the same as u-boot-xlnx source, it generates with OF_EMBED=y. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-qemu.inc: Move common runqemu setup to includeNathan Rossi2016-10-111-0/+35
| | | | | | | | | | | | | Move the common setup for QEMU machines into an include call 'machine-xilinx-qemu.inc'. This include is added to any machine that has a QEMU model. It sets up common QB_* values as well as inheriting the qemuboot class and adding the EXTRA_IMAGEDEPENDS on qemu-native. This include also has helper functions to automatically determine the DTB from KERNEL_DEVICETREE/MACHINE_DEVICETREE and automatically setup the 'console=' kernel command line based on SERIAL_CONSOLE. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Only recommend mali when machine has featureNathan Rossi2016-08-171-1/+1
| | | | | | | Only recommend the kernel-module-mali if the kernel provider is currently linux-xlnx and the current machine has the 'mali' feature. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Only recommend mali module for linux-xlnxNathan Rossi2016-08-071-1/+3
| | | | | | | | | Only recommend the kernel-module-mali if the kernel provider is currently linux-xlnx. This is due to linux-xlnx providing the support for this external module, other kernels such as linux-yocto do not support it. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Fix misspelled "kernel-module-mali"Mike Looijmans2016-08-071-1/+1
| | | | | | | | The kernel module is named "kernel-module-mali", not "kernel-module-mali-modules" Fix this in machine-xilinx-default.inc. Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Add MALI kernel moduleManjukumar Matha2016-05-261-0/+3
| | | | | | | Enable adding the MALI kernel module to the image for ZynqMP machines Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Disable 'qemu-usermode' for MicroBlazeNathan Rossi2016-05-181-0/+3
| | | | | | | | | | | | | The qemu-usermode machine feature enables the ability for using QEMU linux-user during the host build. This allows for the distro feature gobject-introspection-data to use linux-user mode of QEMU to generate data. But this process is broken on MicroBlaze due to issues with glib and the MicroBlaze toolchain. This change disables the use of QEMU linux-user and is a workaround to avoid the execution of the gobject-introspection-data process which is default enabled in commonly used distros ('nodistro' and 'poky'). Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: uboot format is binManjukumar Matha2016-05-131-0/+1
| | | | | | | u-boot output is bin suffix format for KC705 microblaze Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* feature-microblaze-*.inc: Updated to v9.6Manjukumar Matha2016-05-132-8/+13
| | | | | | | Update to the latest v9.6 tune feature Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Update default linux-yocto version to 4.4Nathan Rossi2016-05-051-1/+1
| | | | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Default to v4.4 kernelManjukumar Matha2016-05-031-1/+1
| | | | | | | Default preferred version for Xilinx kernel is v4.4 Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Handle 'u-boot-dtb.img' for ZynqNathan Rossi2016-03-251-1/+6
| | | | | | | | | Handle the case where mainline u-boot does not default to having the target device tree embedded into the u-boot ELF via OF_EMBED, which is default for the u-boot-xlnx source tree. Select the UBOOT_BINARY value based on the currently configured virtual/bootloader provider. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-*.inc: Remove default append for 'device-tree'Nathan Rossi2016-03-062-5/+0
| | | | | | | | | | * The device-tree recipe is not required for all machines or all boards, remove the default append to allow each machine to add the dependency when needed * Add the 'device-tree' as a machine RDEPEND for all machines that use the device-tree recipe to obtain the machines device tree output Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* device-tree.bb: Move zynq7-base.dtsi into recipe sourceNathan Rossi2016-03-061-5/+0
| | | | | | | | | * Move zynq7-base.dtsi out of conf/machine/boards and into the files/ directory of the device-tree recipe * Also move the config from machine-xilinx-default.inc that includes the dtsi for zynq targets Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* tune-zynq: Change ABI to hard-float with thumbManjukumar Matha2016-02-291-1/+1
| | | | | | | | | Zynq-7000 devices support hard-float with thumb-2 instruction set. Xilinx SDK toolchain with hard-float enabled will be available from v2016.1 release. Hence the ABI needs to change to match the toolchain. Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Update default linux-xlnx to 4.0%Nathan Rossi2016-01-061-1/+1
| | | | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* Fix up UBOOT_BINARY for Zynq and setup SPL to load correctlyNathan Rossi2015-11-261-1/+0
| | | | | | | | | | u-boot-xlnx 'xilinx-v2015.2' (fixed in newer versions) incorrectly sets the SPL image to load as 'u-boot-dtb.img' despite the images being built having embedded device trees (OF_EMBED=y). This change fixes this up so that there are no hacks to the u-boot recipes and no overrides to use the incorrectly named U-Boot image file. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* Fix up use of '_append +='Nathan Rossi2015-11-262-3/+3
| | | | | | | | | | | | The use of '_append' and '+=' together is considered bad practice within recipes. It is preferred to explicitly add the preceeding spaces where they are applicable instead of using the '+=' to achieve the same result. Change all the uses of '_append +=' to match the recommended pattern, adding in spaces where explicitly required. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-*.inc: Not all MicroBlaze machines need device-treeNathan Rossi2015-09-242-2/+3
| | | | | | | * Not all MicroBlaze machines need the 'device-tree' dependency, move this to being a board common setup Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Update default linux-yocto to 4.1%Nathan Rossi2015-09-211-1/+1
| | | | | | Update the default linux-yocto version to 4.1%. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Unpin u-boot-xlnx versionNathan Rossi2015-09-151-1/+0
| | | | | | | | * There is only one version of u-boot-xlnx, so there is no need to pin the version. Additionally if there are two versions the newest will be used by default Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* u-boot-elf.inc: Available in oe-core, drop from layerNathan Rossi2015-09-151-0/+2
| | | | | | | | * Remove use of u-boot-elf.inc * Move UBOOT_ELF setting into machine-xilinx-default.inc * Remove u-boot.elf.inc Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* ep108-zynqmp: Use mainline u-boot by defaultNathan Rossi2015-09-091-0/+1
| | | | | | | * Upstream u-boot supports ZynqMP * Default all 'zynqmp' machines to use upstream u-boot Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Add variable for default u-bootNathan Rossi2015-09-091-1/+2
| | | | | | | * Allow for overriding of the default u-boot provider for various archs and machines Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* linux-zynqmp-mainline: Drop custom ZynqMP kernel recipeNathan Rossi2015-09-091-0/+1
| | | | | | | | * The features of this kernel are available upstream and in the linux-yocto 4.1 kernel * Default ZynqMP machines to use linux-yocto as the default kernel Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* machine-xilinx-default.inc: Set default version of linux-xlnx to 3.19Nathan Rossi2015-07-231-1/+1
| | | | | | | | * Set the default to the newer linux-xlnx 3.19 kernel (xilinx-v2015.2) * This only applies to machines that default the virtual/kernel provider to linux-xlnx Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* tune-microblaze.inc: Remove SOC_FAMILY add MACHINEOVERRIDES additionNathan Rossi2015-05-051-2/+3
| | | | | | | | * Remove the use of SOC_FAMILY in the tune-microblaze.inc include * Add "microblaze" to MACHINEOVERRIDES when the "microblaze" feature is part of TUNE_FEATURES Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* tune-microblaze-features.inc: Force either 'el' or 'eb' for TUNE_ARCHNathan Rossi2015-05-051-1/+2
| | | | | | | | | * Change the TUNE_ARCH variable so that for MicroBlaze the endianess in part of the TUNE_ARCH value * This causes the triplet for MicroBlaze targets to have either microblazeel or microblazeeb and prevents any confusion about defaults Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-board.inc: Fixup value for u-boot image fileNathan Rossi2015-05-042-1/+2
| | | | | | | | * Default the value of UBOOT_BINARY in machine-xilinx-default.inc so that machine-xilinx-board.inc can use the variable to define the file name of the u-boot image Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* tune-microblaze.inc: Update default U-Boot configNathan Rossi2015-04-211-1/+1
| | | | | | | | * The "microblaze-generic" board in U-Boot has the config name of "microblaze-generic_config" due to the changes that occured in the U-Boot build system Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-default.inc: Setup UBOOT_SUFFIX for ZynqMPNathan Rossi2015-04-211-0/+1
| | | | | | * For ZynqMP U-Boot, the image suffix is '.bin' Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-default.inc: Use ??= for preferred providerNathan Rossi2015-04-211-2/+1
| | | | | | | * Setup the preferred provider for virtual/bootloader with ??= * Remove setting of "u-boot" preferred provider Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* include/tune-zynqmp.inc: Add tune for ZynqMPNathan Rossi2015-04-201-0/+12
| | | | | | | * Specifies SOC_FAMILY and DEFAULTUNE * Setups up some defaults for AArch64 Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-default.inc: Clean-up device-tree RDEPENDSNathan Rossi2015-04-201-1/+3
| | | | | | | * Only add device-tree to MACHINE_ESSENTIAL_EXTRA_RDEPENDS for MicroBlaze and Zynq Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-default.inc: Default MicroBlaze to linux-yocto providerNathan Rossi2015-04-201-1/+4
| | | | | | | | * Default the virtual/kernel for MicroBlaze to linux-yocto * Add the "XILINX_DEFAULT_KERNEL" variable to allow different defaults based on machine overrides Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-default.inc: Update default linux-yocto to 3.19Nathan Rossi2015-04-201-1/+1
| | | | | | * Update the default linux-yocto version to 3.19 Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
* machine-xilinx-default.inc: By default all machines have no RTCNathan Rossi2015-04-171-0/+2
| | | | | | | * MicroBlaze and Zynq machines do not have an RTC on chip, disable backfilling the 'rtc' feature Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>