summaryrefslogtreecommitdiffstats
path: root/conf/machine
Commit message (Collapse)AuthorAgeFilesLines
* machine-xilinx-default.inc: Remove version pinning for linux-xlnxNathan Rossi2017-05-151-2/+0
| | | | | | | Remove the version pinning for linux-xlnx, this allows for using the newest version available without needing to change the include. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zcu102-zynqmp: Pin to pre-v2017.1 versions of kernel, u-boot and atfNathan Rossi2017-05-151-0/+6
| | | | | | | | | | Pin the versions of linux-xlnx, u-boot-xlnx and arm-trusted-firmware to the version prior to xilinx-v2017.1. This is due to the added requirement of pmu-firmware for xilinx-v2017.1. Currently it is not possible to boot the zcu102-zynqmp machine in QEMU with the newer versions due to missing the pmu rom as well as the pmu firmware itself. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* kc705-microblazeel: Pin to u-boot-xlnx at xilinx-v2016.4Nathan Rossi2017-05-151-0/+3
| | | | | | | | Pin the preferred provider and version of the kc705-microblazeel machine to u-boot-xlnx and Xilinx release version xilinx-v2016.4. This is due to patches only available for this version of u-boot-xlnx. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* u-boot-zynq-uenv.bb: Add recipe to generate uEnv.txt environmentNathan Rossi2017-05-157-4/+38
| | | | | | | | | | | | | | | Add a recipe to generate uEnv.txt environments for SD boot of Zynq targets. This replaces the existing uEnv.txt for zc702/zedboard that were manually created and populated only for u-boot-xlnx builds. The generated uEnv.txt files also support auto loading of the fpga bitstream before the kernel. Also enable the use of this recipe for all *-zynq7 machines that use U-Boot and have SD/eMMC available. And additionally setup IMAGE_BOOT_FILES for these machines. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zybo-linux-bd-zynq7: Update to use FORCE_PLATFORM_INITNathan Rossi2017-04-281-1/+1
| | | | | | | Use FORCE_PLATFORM_INIT, setting it to "1" to force U-Boot to use the platform-init from a virtual/xilinx-platform-init provider. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zcu102-zynqmp: Update QB_MEM to 4GB to match boardNathan Rossi2017-04-281-1/+1
| | | | | | | | | Update the QB_MEM value to match the size of memory that is expected to be emulated for the board. The ZCU102 board has 4GB of DRAM attached to the PS. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
* qemuboot-xilinx.bbclass: Rework qemu-xilinx setupNathan Rossi2017-04-285-36/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-7/+11
| | | | | | | | 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>
* device-tree.bbappend: Move use of MACHINE_DEVICETREE to SRC_URINathan Rossi2017-04-265-13/+0
| | | | | | | | | | | | | | | | | | | | | Remove the use of MACHINE_DEVICETREE for providing sources to device-tree, instead provide the device tree sources as SRC_URI entires. Whilst this was already being done automatically by the MACHINE_DEVICETREE logic it also created a non-standard way of providing the device tree sources to the recipe. The setup of SRC_URI is done via the use of a device-tree.bbappend instead of directly in the device-tree.bb recipe itself. This is for two reason, separation of the source from the build logic as well as to provide an example for how a user can extend the device-tree recipe to provide custom device tree sources in their layer. This change also moves the paths to the sources around, this is to align the names of the directories to match the OVERRIDES so that when expanding the file paths it will search the subdirs based on the OVERRIDES or machine names. 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-162-10/+10
| | | | | | | | | | 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>
* zcu102-zynqmp: fix machine name in confJean-Francois Dagenais2017-02-141-1/+1
| | | | | Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* conf/machine/*.conf: Move to QB_NETWORK_DEVICE for QEMU targetsNathan Rossi2017-02-015-10/+5
| | | | | | | | | | | | | Move the setup of network devices to the new QB_NETWORK_DEVICE variable, this avoids the need to configure slirp or tap options from the machine configuration. Additionally this provides the benefit of letting runqemu handle the setup of tap and slirp arguments, allowing for it to provide features such as host-guest port forwarding for slirp. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Tested-by: Alistair Francis <alistair.francis@xilinx.com>
* zcu102: Add support for running Xilinx's QEMUAlistair Francis2017-01-181-1/+18
| | | | | Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.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>
* zynqmp: Consolidate the QEMU dependenciesAlistair Francis2017-01-182-8/+0
| | | | | 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>
* zc706-zynq7: add missing support for ext3.Cyril Chemparathy2016-11-191-1/+1
| | | | | | | This seems to have been missed out at some point along the way. Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> 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>
* qemu* -> *qemu-*: Rename QEMU machinesNathan Rossi2016-10-273-4/+4
| | | | | | | | | | | | | | | Rename the QEMU machines to match the <board>-<design>-<arch> convention. QEMU only machines no longer need to be named qemu*. Note for qemuzynq it is special in that it does not model a board, as such it has no board in the name being just 'qemu-zynq7'. This updates the README.md to match the new machine names. Additional update all occurrences of the qemu* machines Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
* zynqmp: Update the machines to take advantage of Xilinx's QEMUAlistair Francis2016-10-112-0/+8
| | | | | | | | Now that their is a .bb for Xilinx's QEMU and QEMU device trees we can update the machines to ensure this is built where applicable. Signed-off-by: Alistair Francis <alistair.francis@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-116-40/+45
| | | | | | | | | | | | | 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>
* qemumicroblaze-s3adsp1800: Add runqemu supportNathan Rossi2016-09-301-0/+11
| | | | | | | | Add runqemu support using the 'petalogix-s3adsp1800' QEMU machine. Based on the qemumicroblaze runqemu setup. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
* ep108-zynqmp, zcu102-zynqmp: Add runqemu supportNathan Rossi2016-09-302-1/+27
| | | | | | | | | | The ep108-zynqmp machine already has support in QEMU however was exposed as the qemuzynqmp machine. QEMU 2.7 introduced support for the 'xlnx-zcu102' machine model. This allows for runqemu to boot a machine based on the ep108 or zcu102 hardware. The support added is based on the configuration that was in qemuzynqmp. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* qemuzynqmp: Remove this machineNathan Rossi2016-09-301-19/+0
| | | | | | | | Remove this machine due to it not being required. The runqemu tools now support running machines base on bsp layer configuration which ep108-zynqmp now provides. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* qemuzynq, qemumicroblaze: Improve runqemu supportNathan Rossi2016-09-302-4/+10
| | | | | | | | | * Handle slirp/tap networking separately. * Force the use of serial port and always disable graphics since the qemuzynq and qemumicroblaze targets do not support any graphics Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
* conf/machine: update for new runqemuRobert Yang2016-09-283-0/+29
| | | | | | | | | The new runqemu has removed machine knowledge, these info can set in bsp's conf file, please see oe-core's meta/classes/qemuboot.bbclass for more info. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 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>
* zcu102-zynqmp: Add the 'mali' machine featureNathan Rossi2016-08-171-1/+1
| | | | 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>
* qemuzynmp: Add the qemuzynqmp machineAlistair Francis2016-06-222-0/+9
| | | | | | | Add the qemuzynqmp machine based on the EP108 board. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> 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>
* kc705-microblazeel.conf: Support for KC705 kitManjukumar Matha2016-05-131-0/+24
| | | | | | | Support for KC705 board kit Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> 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>
* kc705-trd-microblazeel: Remove kc705-trd filesManjukumar Matha2016-05-131-29/+0
| | | | | | | Remove old kc705-trd reference 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>
* zcu102-zynqmp.conf: Add support for ZCU102 boardManjukumar Matha2016-05-041-0/+23
| | | | | | | Add support for ZCU102 Zynq UltraScale+ MPSoC evaluation board Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zybo-linux-bd-zynq7: Use FORCE_PS7INIT to override platform-initNathan Rossi2016-05-031-0/+1
| | | | | | | Override the platform init provided in U-Boot sources for the 'zybo' board. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zybo-linux-bd-zynq7: Force default kernel and u-bootNathan Rossi2016-05-031-0/+3
| | | | | | | | | | The zybo-linux-bd-zynq7 machine relies on drivers from the linux-xlnx kernel, default the machine to use the linux-xlnx kernel. The machine also relies on functionality and patching of the mainline u-boot (as opposed to u-boot-xlnx). Default to the mainline u-boot. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
* zybo-linux-bd-zynq7: Enable required kernel driversJason Wu2016-05-031-0/+7
| | | | | | | Enable DRM, SND, KP-GPIO and V4L2 kconfigs Signed-off-by: Jason Wu <jason.wu.misc@gmail.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>