Commit Graph

14 Commits

Author SHA1 Message Date
Masahiro Yamada
6dd5a33c48 zynq_zed: bump U-Boot to xilinx-v2016.2
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>
2016-07-30 18:13:01 +02:00
Thomas Petazzoni
4846700a1b board/avnet: swap ramdisk and DT load addresses in U-Boot environment
As reported in bug #9091, the U-Boot environment we provide for the
Microzed and Zedboard platforms loads the ramdisk at 0x2000000 and the
DT at 0x3000000. This means that a large enough ramdisk overwrites the
DT. It makes more sense to load the DT at 0x2000000 and the ramdisk at
0x3000000.

Reported-by:  Michael Monaghan <michaellmonaghan@gmail.com>
Tested-by: Michael Monaghan <michaellmonaghan@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-24 22:44:07 +02:00
Masahiro Yamada
c13f896686 configs: rename Zynq defconfig files
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>
2016-03-31 18:40:43 +02:00
Gwenhael Goavec-Merou
d761f0f408 zedboard: uboot: load env earlier
By default, with the original patch bootcmd runs sdboot before loading uEnv.txt.
Consequently, if the user change modeboot, the user's defined content is updated
too late.
By loading uEnv.txt before 'run $modeboot' the correct boot mode is used instead
of default mode.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Acked-By: Jan Viktorin <viktorin@rehivetech.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-11-16 21:53:48 +01:00
Davide Viti
03130f944a microzed: add Avnet Microzed support
Changes are based on Zedboard: Xilinx does not provide a specific DTS
for Microzed in the kernel tree. It is suggested [1] to use the
zynq-zed.dts and change the RAM size

[1] https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856

[Thomas:
 - extend readme.txt to indicate why the same DTB is used for Microzed
   and the Zedboard.
 - add a description + Signed-off-by line in the
   0001-zynq-Create-microzed-specific-U-Boot-environment.patch, by
   re-using the description of the same patch for the Zedboard.]

Signed-off-by: Davide Viti <d.viti@infosolution.it>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-09-17 23:54:39 +02:00
Jan Viktorin
1f640a4e7a zedboard: Switch to U-Boot 2015.07
The U-Boot v2015.07 is required for successful out-of-the-box
build for common Xilinx Zynq boards (including Zedboard).

Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-22 14:31:55 +02:00
Jan Viktorin
c139f0cce7 zedboard: Update readme.txt to reflect BOOT.BIN generation
Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-18 23:06:52 +02:00
Jan Viktorin
4db53c3848 zedboard: Patch default U-Boot environment for zedboard
This patch changes the U-Boot's default environment to
boot Zedboard out-of-the-box from SD card.

The sdboot procedure tries to load a file system.bit into
the Zynq's PL (only if it exists). It is also possible to
alter the booting by an uEnv.txt file located on your SD card.
The uEnv.txt is a plain text file with <key>=<value> pairs
one per line.

Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-18 23:06:45 +02:00
Masahiro Yamada
5b686a0674 Fix typos in comment blocks
[Thomas: fix issues noticed by Arnout:
  - Rewrap the linux/Config.in paragraph
  - Revert the "is a toolchain dependency" -> "has a toolchain
    dependency" change from pkg-generic.mk, as the original was
    correct.]

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 22:44:43 +02:00
Javier Domingo Cansino
2b6679baba board/avnet/zedboard/: improve readme.txt explanations
[Thomas: fix small grammar issue noticed by Spenser Gilliland, adjust
commit title.]

Signed-off-by: Javier Domingo Cansino <javierdo1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-22 22:06:15 +02:00
Spenser Gilliland
51bc99a485 configs: bump zedboard to 2014.1
Bump zedboard defconfig to version 2014.1.  This makes it possible to use
uboot-spl instead of the xilinx specific fsbl.  However, the result is kinda
hacky due to the licensing state of ps7_init.{c,h} needed for building uboot
spl.  Directions for building a proper boot.bin using the new methodolgy is
included in the readme.txt.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-09 12:09:20 +02:00
Spenser Gilliland
acb457e750 defconfigs: zedboard add info about uboot installation
Add info about how to install a custom uboot on the zedboard.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-07 21:35:34 +01:00
Spenser Gilliland
12106fc69b zedboard: add Avnet Zedboard support.
[Thomas: update to recent Buildroot which had renamed several
Config.in options, lock down kernel headers version]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-06 23:08:54 +01:00
Stephan Hoffmann
49084a1982 Microblaze: added defconfig for Avnet S6LX9 Microboard
The Avnet S6LX9 Microboard is a small USB-Stick sized module
containing a Spartan6 FPGA capable of running the Microblaze
softcore processor together with RAM and FLASH memory.

This board support pachage assumes that the Microblaze Bitfile
available from the Avnet website is programmed into the FPGA.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-03-18 22:57:17 +01:00