This patch bumps the zed to Xilinx release 2022.2.
Xilinx 2022.2 includes:
- U-Boot 2022.01 bug fixes
- Linux bump to Linux 5.15.36 with bug fixes
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This patch migrates the u-boot device tree definition
from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS
instead for the zynq_zc706, zynq_zed and zynq_microzed defconfigs.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This patch bumps configs/zynq_xxx_defconfigs to Xilinx software release 2022.1
which includes the following updates:
- U-Boot bumped to 2022.01
- Linux bumped to 5.15.19
- rootfs changed from CPIO to EXT4
- extlinux.conf for distro boot support
- U-Boot migrated from git clone to tarball for faster builds
This patch has been build and run tested on a ZC706 evaluation board.
This patch has been build tested only for zed, microzed and qmtech boards.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Bump to the most recent Xilinx release.
Fixes:
.../output/host/include/libfdt_env.h:71:30: error: conflicting types for ‘fdt64_t’
.../output/host/include/libfdt_env.h:91:24: error: expected ‘)’ before ‘x’
.../output/host/include/libfdt.h:150:21: error: redefinition of ‘fdt_offset_ptr_w’
...and many, many other similar errors.
[Run-time tested]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
The Zynq SoCs are now well supported in the mainline kernel, thus stop
using the Xilinx fork.
As there is not xilinx_zynq defconfig in mainline, use the default
arch config.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
The linux git trees on github can be huge, and takes a long time to
download, which is not very nice nor convenient for newcomers.
Switch them to using a wget, with the github macro.
A nice side effect of this conversion, is that we no longer need to wait
for the git clone to finish to notice that the ref is gone; doing a wget
will instantly fail in that case.
Mechanical patch, obtained by running (hang-on tight):
$ sed -r -i -e 's/BR2_LINUX_KERNEL_CUSTOM_GIT/BR2_LINUX_KERNEL_CUSTOM_TARBALL/; /BR2_LINUX_KERNEL_CUSTOM_REPO_URL/N; s:BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https\://github.com/([^/]+)/(.+)"\nBR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="(.+)":BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,\1,\2,\3)/linux-\3.tar.gz":; s/(call github.*)\.git/\1/;' $(grep -l 'BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com' configs/*)
olimex_a20_olinuxino_lime_mali had a comment in between, so it was
manually fixed thereafter; that comment was also moved.
Except for socrates_cyclone5 which did not work previously (missing tag
in git tree?), all the affected defconfigs still download their sources.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Run-time tested on ZedBoard, build-tested on the other boards]
[Peter: also add host-dosfstools / host-mtools to make vfat images]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
We are about to introduce genimage support for the Zynq boards. For
all of them U-Boot loads the DTB from a file named "devicetree.dtb" so
we need to rename it on the SD card image.
We could use genimage itself to rename files while creating the
image. But this would require a different genimage.cfg for each board,
leading to duplicate code.
Instead let's create a "devicetree.dtb" symlink pointing to the dtb
listed in the configuration. Currently all the Zynq-based boards have
only one DTS configured, but if one had two or more of them, the
symlink would point to the first one.
[Peter: only create symlink if dtb option is available]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
The Zynq ZedBoard defconfig does not build anymore since commit
6cda724efb ("package/gcc: switch to gcc
6.x as the default"). Fix by upgrading to the latest U-Boot version,
xilinx-v2017.1, based on mainline v2017.01.
Fixes:
In file included from include/linux/compiler.h:54:0,
from include/linux/bitops.h:5,
from ./include/common.h:20:
include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory
#include gcc_header(__GNUC__)
^
compilation terminated.
[Build- and run-tested]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The U-Boot configuration for Zynq boards have CONFIG_FIT_SIGNATURE=y,
so they need OpenSSL to be available on the host system. In order to
add OpenSSL to the build this commit adds the
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y to the relevant defconfigs.
Fixes#9316.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The recent U-Boot adopts Kconfig for its configuration system.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This is the latest release tag in the Xilinx repository, based on
U-Boot v2016.01 in the mainline.
Commit 46d6a561be ("zedboard: Generate BOOT.BIN automatically")
switched from the Xilinx GitHub repository to the U-Boot mainline,
but this commit gets it back to the Xilinx GitHub repository for the
following reasons:
- This defconfig still relies on the Xilinx's local repository for
the kernel. The vendor does the best test for the combination of
U-Boot and the kernel with the same release tag (xilinx-v2016.2
in this case).
- At the time of commit 46d6a561be, the u-boot-xlnx still needed
manual copy of ps7_init(_gpl).c/h in order to build a working SPL
image. So, the mainline U-Boot had advantage in that point of
time. However, the improvement in the mainline U-Boot was merged
into the u-boot-xlnx at the xilinx-v2015.3 release. Now, the
mainline and the u-boot-xlnx are even in this point of view.
- The mainline U-Boot defaults to boot FIT, so something must be
done; either patch environments around with a local patch to
switch to uImage booting (current solution), or build an FIT
with a post build script (chromebook snow does this). On the
other hand, the Xilinx repository defaults to uImage booting,
so it is straightforward, and needs no addition care.
This commit does:
- Switch to the Xilinx custom git repository, and stick to the
xilinx-v2016.2 tag.
- Delete the local patch board/avnet/zedboard/uboot/0001...
since the Xilinx custom repository can boot uImage by default.
- Enable BR2_TARGET_UBOOT_FORMAT_IMG instead of ..._FORMAT_DTB_IMG
since all the Zynq boards in U-Boot enable CONFIG_OF_EMBED.
- Replace BR2_TARGET_UBOOT_ZYNQ_IMAGE with BR2_TARGET_UBOOT_SPL_NAME
since U-Boot can natively generate the Zynq boot image now. The
Zynq image support for mkimage tool was upstreamed at v2016.01
(so xilinx-v2016.1 as well), so no additional tool is needed
any more.
- Update readme.txt
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This is the latest release tag in the Xilinx repository, based on
Linux v4.4 in the mainline.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This makes it possible to clone git repositories hosted on Github while
behind a firewall.
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Commit 5c67cb1d04 ("linux: use zImage by default on ARM") changed
the default kernel image, but missed to update Zynq defconfigs.
U-Boot on Zynq boards still loads uImage, so BR2_LINUX_KERNEL_UIMAGE
should be defined to generate uImage.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
These three are Zynq boards and the build procedure is almost the
same. Having the SoC name prefix "zynq_" would be more consistent.
Also, this is the way in which the Linux Device Trees and the U-Boot
configuration files do.
This commit renames as follows:
zedboard_defconfig -> zynq_zed_defconfig
microzed_defconfig -> zynq_microzed_defconfig
xilinx_zc706_defconfig -> zynq_zc706_defconfig
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
