[Buildroot] [PATCH 0/7] zynq: bump all Zynq boards to newest U-Boot, Linux, unifying readme.txt

[Buildroot] [PATCH 0/7] zynq: bump all Zynq boards to newest U-Boot, Linux, unifying readme.txt

[Masahiro Yamada]

Currently, Buildroot supports three Zynq boards.  This series bumps
all of them to the latest U-Boot and Linux which are available in
the Xilinx GitHub repository.

Building systems for Zynq boards is getting easy and easy.  With this
series, we need no more manual intervention, no more local patches.

Also, three similar readme files are merged together.  Maintaining
the documents will be easier too.

After bumped to the same version, the build procedure is almost the
same for the Zynq-based boards.  The difference is only in U-Boot
board defconfig and the Device Tree file name.  This applies to other
Zynq boards that are not supported by Buildroot natively.

So, I come up with one question; how many defconfigs we want to
support for similar build steps?  I know the support for Zynq Zybo
board is being proposed.

We can boot the system on Zybo board, starting from zynq_zed_defconfig,
by changing two options from "make menuconfig":
BR2_LINUX_KERNEL_INTREE_DTS_NAME=zynq-zybo
BR2_TARGET_UBOOT_BOARDNAME=zynq_zybo

That's it.

So far, new Zynq board supports have been added time to time,
by copy-paste work (see commit 03130f944a2053, for example),
but maintained separately. And now we are going to support another
board maintained by another developer.  We are duplicating efforts.
I want to see improvements for all the Zynq boards synced.
If we use genimage for Zybo board, why not for the existing three
boards?  Let's think about it.  This is my point of this series.

(Moreover, I want to merge three defconfigs into one.)


Masahiro Yamada (7):
  zynq_zed: bump Linux to xilinx-v2016.2
  zynq_zed: bump U-Boot to xilinx-v2016.2
  zynq_microzed: bump Linux to xilinx-v2016.2
  zynq_microzed: bump U-Boot to xilinx-v2016.2
  zynq_zc706: bump Linux to xilinx-v2016.2
  zynq_zc706: bump U-Boot to xilinx-v2016.2
  zynq: unify readme.txt for all Zynq boards

 board/avnet/microzed/readme.txt                    | 68 ----------------------
 ...eate-microzed-specific-U-Boot-environment.patch | 41 -------------
 board/avnet/zedboard/readme.txt                    | 64 --------------------
 ...eate-zedboard-specific-U-Boot-environment.patch | 45 --------------
 board/xilinx/zc706/readme.txt                      | 56 ------------------
 board/zynq/readme.txt                              | 52 +++++++++++++++++
 configs/zynq_microzed_defconfig                    | 15 +++--
 configs/zynq_zc706_defconfig                       | 12 ++--
 configs/zynq_zed_defconfig                         | 15 +++--
 9 files changed, 72 insertions(+), 296 deletions(-)
 delete mode 100644 board/avnet/microzed/readme.txt
 delete mode 100644 board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
 delete mode 100644 board/avnet/zedboard/readme.txt
 delete mode 100644 board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
 delete mode 100644 board/xilinx/zc706/readme.txt
 create mode 100644 board/zynq/readme.txt

-- 
1.9.1

[Buildroot] [PATCH 1/7] zynq_zed: bump Linux to xilinx-v2016.2

[Masahiro Yamada]

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>
---

 configs/zynq_zed_defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index d3cfa70..98b010e 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -1,13 +1,12 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
-# Linux headers same as kernel, a 3.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
-- 
1.9.1

[Buildroot] [PATCH 2/7] zynq_zed: bump U-Boot to xilinx-v2016.2

[Masahiro Yamada]

This is the latest release tag in the Xilinx repository, based on
U-Boot v2016.01 in the mainline.

Commit 46d6a561be41 ("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 46d6a561be41, 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>
---

 board/avnet/zedboard/readme.txt                    | 52 ++++------------------
 ...eate-zedboard-specific-U-Boot-environment.patch | 45 -------------------
 configs/zynq_zed_defconfig                         | 10 ++---
 3 files changed, 13 insertions(+), 94 deletions(-)
 delete mode 100644 board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch

diff --git a/board/avnet/zedboard/readme.txt b/board/avnet/zedboard/readme.txt
index 01ef97c..b2c30a3 100644
--- a/board/avnet/zedboard/readme.txt
+++ b/board/avnet/zedboard/readme.txt
@@ -9,52 +9,16 @@ Steps to create a working system for Zedboard:
 
 1) make zynq_zed_defconfig
 2) make
-3) copy files BOOT.BIN, u-boot-dtb.img, rootfs.cpio.uboot,
-	uImage, zynq-zed.dtb into your SD card
+3) All needed files will be available in the output/images directory.
+   Create a FAT32 partition at the beginning of your SD Card and copy files:
+     - boot.bin
+     - u-boot.img
+     - uImage
+     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
+     - devicetree.dtb (should be renamed from zynq-zed.dtb)
+   into your SD card
 4) boot your Zedboard
 
-The expected output:
-
- U-Boot SPL 2015.07 (Jul 22 2015 - 12:01:55)
- mmc boot
- reading system.dtb
- spl_load_image_fat_os: error reading image system.dtb, err - -1
- reading u-boot-dtb.img
- reading u-boot-dtb.img
-
- U-Boot 2015.07 (Jul 22 2015 - 12:01:55 +0200)
-
- Model: Zynq ZED Board
- I2C:   ready
- DRAM:  ECC disabled 512 MiB
- MMC:   zynq_sdhci: 0
- Using default environment
- ...
-
-When using an older U-Boot then 2015.07, a working ps7_init.c
-file is required to be installed into the U-Boot directory
-structure. From 2015.07, the major Zynq-based boards are
-supported without any manual intervention.
-
-Resulting system
-----------------
-A FAT32 partition should be created at the beginning of the SD Card
-and the following files should be installed:
-	/BOOT.BIN
-	/zynq-zed.dtb
-	/uImage
-	/rootfs-cpio.uboot
-	/u-boot-dtb.img
-
-
-All needed files can be taken from output/images/
-
-BOOT.BIN, uImage and u-boot-dtb.img are direct copies of the same files
-available on output/images/
-
-There is a patch attached that redefines the U-Boot's environment
-to work with Buildroot out-of-the-box.
-
 You can alter the booting procedure by creating a file uEnv.txt
 in the root of the SD card. It is a plain text file in format
 <key>=<value> one per line:
diff --git a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
deleted file mode 100644
index 6dae31e..0000000
--- a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a4c0058967a551385da5e16d2787d9f704cab225 Mon Sep 17 00:00:00 2001
-From: Jan Viktorin <viktorin@rehivetech.com>
-Date: Thu, 18 Jun 2015 16:26:02 +0200
-Subject: [PATCH 2/2] zynq: Create zedboard-specific U-Boot environment
-
----
- include/configs/zynq_zed.h | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
-index 946de95..2400a88 100644
---- a/include/configs/zynq_zed.h
-+++ b/include/configs/zynq_zed.h
-@@ -24,4 +24,28 @@
-
- #include <configs/zynq-common.h>
-
-+#undef CONFIG_EXTRA_ENV_SETTINGS
-+#define CONFIG_EXTRA_ENV_SETTINGS \
-+	"envload=mmc info && if fatload mmc 0 0x1000 uEnv.txt;"\
-+	" then echo Importing uEnv.txt; env import -t 0x1000"  \
-+	" $filesize; fi;\0"                                    \
-+	"bootcmd=run envload; run $modeboot\0"                 \
-+	"modeboot=sdboot\0"                                    \
-+	"baudrate=115200\0"                                    \
-+	"bootenv=uEnv.txt\0"                                   \
-+	"devicetree_image=zynq-zed.dtb\0"                      \
-+	"kernel_image=uImage\0"                                \
-+	"ramdisk_image=rootfs.cpio.uboot\0"                    \
-+	"fpga_image=system.bit\0"                              \
-+	"sdboot=echo Booting from SD...; run fpgaboot;"        \
-+	" fatload mmc 0 0x1000000 ${kernel_image}"             \
-+	" && fatload mmc 0 0x2000000 ${ramdisk_image}"         \
-+	" && fatload mmc 0 0x3000000 ${devicetree_image}"      \
-+	" && bootm 0x1000000 0x2000000 0x3000000\0"            \
-+	"fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image};"   \
-+	" then echo Booting FPGA from ${fpga_image};"          \
-+	" fpga info 0 && fpga loadb 0 0x1000000 $filesize;"    \
-+	" else echo FPGA image ${fpga_image} was not found,"   \
-+	" skipping...; fi;\0"
-+
- #endif /* __CONFIG_ZYNQ_ZED_H */
---
-2.4.3
-
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 98b010e..84859bb 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -17,10 +17,10 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="zynq_zed"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07"
-BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/avnet/zedboard/uboot"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_ZYNQ_IMAGE=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
-- 
1.9.1

[Buildroot] [PATCH 3/7] zynq_microzed: bump Linux to xilinx-v2016.2

[Masahiro Yamada]

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>
---

 configs/zynq_microzed_defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 06d0d7f..7b44af6 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -1,13 +1,12 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
-# Linux headers same as kernel, a 3.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
-- 
1.9.1

[Buildroot] [PATCH 4/7] zynq_microzed: bump U-Boot to xilinx-v2016.2

[Masahiro Yamada]

This is the latest release tag in the Xilinx repository, based on
U-Boot v2016.01 in the mainline.  To sync with the Zedboard updates,
switch over to the Xilinx GitHub repository.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 board/avnet/microzed/readme.txt                    | 53 ++++------------------
 ...eate-microzed-specific-U-Boot-environment.patch | 41 -----------------
 configs/zynq_microzed_defconfig                    | 10 ++--
 3 files changed, 14 insertions(+), 90 deletions(-)
 delete mode 100644 board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch

diff --git a/board/avnet/microzed/readme.txt b/board/avnet/microzed/readme.txt
index d0fc5ee..927e97a 100644
--- a/board/avnet/microzed/readme.txt
+++ b/board/avnet/microzed/readme.txt
@@ -9,56 +9,21 @@ Steps to create a working system for Microzed:
 
 1) make zynq_microzed_defconfig
 2) make
-3) copy files BOOT.BIN, u-boot-dtb.img, rootfs.cpio.uboot,
-	uImage, zynq-zed.dtb into your SD card
+2) make
+3) All needed files will be available in the output/images directory.
+   Create a FAT32 partition at the beginning of your SD Card and copy files:
+     - boot.bin
+     - u-boot.img
+     - uImage
+     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
+     - devicetree.dtb (should be renamed from zynq-zed.dtb)
+   into your SD card
 4) boot your Microzed
 
-The expected output:
-
- U-Boot SPL 2015.07 (Sep 15 2015 - 16:10:56)
- mmc boot
- reading system.dtb
- spl_load_image_fat_os: error reading image system.dtb, err - -1
- reading u-boot-dtb.img
- reading u-boot-dtb.img
-
-
- U-Boot 2015.07 (Sep 15 2015 - 16:10:56 +0200)
-
- Model: Zynq MicroZED Board
- I2C:   ready
- DRAM:  ECC disabled 1 GiB
- MMC:   zynq_sdhci: 0
- Using default environment
- ...
-
-When using an older U-Boot then 2015.07, a working ps7_init.c
-file is required to be installed into the U-Boot directory
-structure. From 2015.07, the major Zynq-based boards are
-supported without any manual intervention.
-
-Resulting system
-----------------
-A FAT32 partition should be created at the beginning of the SD Card
-and the following files should be installed:
-	/BOOT.BIN
-	/zynq-zed.dtb
-	/uImage
-	/rootfs-cpio.uboot
-	/u-boot-dtb.img
-
-All needed files can be taken from output/images/
-
-BOOT.BIN, uImage and u-boot-dtb.img are direct copies of the same files
-available on output/images/.
-
 Note th at the DTB (zynq-zed.dtb) is the same as the one used for the
 Zedboard, and that this is the recommended solution, see
 https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856.
 
-There is a patch attached that redefines the U-Boot's environment
-to work with Buildroot out-of-the-box.
-
 You can alter the booting procedure by creating a file uEnv.txt
 in the root of the SD card. It is a plain text file in format
 <key>=<value> one per line:
diff --git a/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch b/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
deleted file mode 100644
index 6a7725f..0000000
--- a/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a4c0058967a551385da5e16d2787d9f704cab225 Mon Sep 17 00:00:00 2001
-From: Jan Viktorin <viktorin@rehivetech.com>
-Date: Thu, 18 Jun 2015 16:26:02 +0200
-Subject: [PATCH] zynq: Create microzed-specific U-Boot environment
-
-This is a copy of the patch supplied for Zedboard.
-
-Signed-off-by: Davide Viti <d.viti@infosolution.it>
-
---- a/include/configs/zynq_microzed.h	2015-07-14 19:32:21.000000000 +0200
-+++ b/include/configs/zynq_microzed.h	2015-09-02 12:19:35.728503472 +0200
-@@ -22,4 +22,29 @@
- 
- #include <configs/zynq-common.h>
- 
-+#undef CONFIG_EXTRA_ENV_SETTINGS
-+#define CONFIG_EXTRA_ENV_SETTINGS \
-+	"envload=mmc info && if fatload mmc 0 0x1000 uEnv.txt;"\
-+	" then echo Importing uEnv.txt; env import -t 0x1000"  \
-+	" $filesize; fi;\0"                                    \
-+	"bootcmd=run $modeboot\0"                              \
-+	"modeboot=sdboot\0"                                    \
-+	"baudrate=115200\0"                                    \
-+	"bootenv=uEnv.txt\0"                                   \
-+	"devicetree_image=zynq-zed.dtb\0"                      \
-+	"kernel_image=uImage\0"                                \
-+	"ramdisk_image=rootfs.cpio.uboot\0"                    \
-+	"fpga_image=system.bit\0"                              \
-+	"sdboot=echo Booting from SD...;"                      \
-+	" run envload; run fpgaboot;"                          \
-+	" fatload mmc 0 0x1000000 ${kernel_image}"             \
-+	" && fatload mmc 0 0x2000000 ${ramdisk_image}"         \
-+	" && fatload mmc 0 0x3000000 ${devicetree_image}"      \
-+	" && bootm 0x1000000 0x2000000 0x3000000\0"            \
-+	"fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image};"   \
-+	" then echo Booting FPGA from ${fpga_image};"          \
-+	" fpga info 0 && fpga loadb 0 0x1000000 $filesize;"    \
-+	" else echo FPGA image ${fpga_image} was not found,"   \
-+	" skipping...; fi;\0"
-+
- #endif /* __CONFIG_ZYNQ_MICROZED_H */
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 7b44af6..fa25857 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -17,10 +17,10 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="zynq_microzed"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07"
-BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/avnet/microzed/uboot"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_ZYNQ_IMAGE=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
-- 
1.9.1

[Buildroot] [PATCH 5/7] zynq_zc706: bump Linux to xilinx-v2016.2

[Masahiro Yamada]

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>
---

 configs/zynq_zc706_defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 2dc4adb..746abcb 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -2,13 +2,12 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_ENABLE_NEON=y
-# Linux headers same as kernel, a 3.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2014.2.01"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
-- 
1.9.1

[Buildroot] [PATCH 6/7] zynq_zc706: bump U-Boot to xilinx-v2016.2

[Masahiro Yamada]

This is the latest release tag in the Xilinx repository, based on
U-Boot v2016.01 in the mainline.  It includes proper ps7_init_gpl.c/h
in it, so builds working SPL without any manual intervention.

BR2_TARGET_UBOOT_BOARD_NAME should be changed to zynq_zc706 since
U-Boot now has separate defconfig files for ZC702 and ZC706 boards.

BR2_TARGET_UBOOT_SPL_NAME should be changed to spl/boot.bin since
the Zynq image support for the mkimage tool was upstreamed and it
now generates boot.bin under spl/ directory.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 board/xilinx/zc706/readme.txt | 69 +++++++++++++------------------------------
 configs/zynq_zc706_defconfig  |  7 +++--
 2 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/board/xilinx/zc706/readme.txt b/board/xilinx/zc706/readme.txt
index b180dea..5034658 100644
--- a/board/xilinx/zc706/readme.txt
+++ b/board/xilinx/zc706/readme.txt
@@ -6,51 +6,24 @@ ZC706 information including schematics, reference designs, and manuals
 are available from
 http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html.
 
-uboot.bin  -- U-Boot SPL w/ Xilinx boot.bin wrapper
----------------------------------------------------
-
-Due to licensing issues, the files ps7_init.c/h are not distributed
-with the U-Boot source code.  These files are required to make a
-boot.bin file.
-
-If you already have the Xilinx tools installed, the following sequence
-will unpack, patch and build the rfs, kernel, uboot, and uboot-spl.
-
-make zynq_zc706_defconfig
-make uboot-patch
-cp ${XILINX_SDK_LIB}/hwplatform_templates/ZC706_hw_platform/ps7_init.{c,h} \
-   output/build/uboot-xilinx-v2014.1/board/xilinx/zynq/
-
-Where ${XILINX_SDK_LIB} is ${XILINX}/SDK/${VERSION}/data/embeddedsw/lib.
-
-After copying these files into the U-Boot source tree, you can
-continue the build with:
-
-make
-
-*Notice*
-While the build will successfully complete without the ps7_init.*
-files, the uboot.bin file generated by this configuration will not
-function properly on the ZC706. Therefore, it is imperative that the
-ps7_init.* files be copied into the U-Boot source tree any time the
-clean, or uboot-dirclean targets are executed.
-
-Resulting system
-----------------
-
-A FAT32 partition should be created at the beggining of the SD Card
-and the following files should be installed:
-
-- boot.bin
-- devicetree.dtb
-- uImage
-- uramdisk.image.gz
-- u-boot.img
-
-All needed files can be taken from <output>/images/
-
-cp <output>/images/boot.bin /media/sdcard/
-cp <output>/images/uImage /media/sdcard/
-cp <output>/images/u-boot.img /media/sdcard/
-cp <output>/images/zynq-zc706.dtb /media/sdcard/devicetree.dtb
-cp <output>/images/rootfs.cpio.uboot /media/sdcard/uramdisk.image.gz
+Steps to create a working system for ZC706 board:
+
+1) make zynq_zc706_defconfig
+2) make
+3) All needed files will be available in the output/images directory.
+   Create a FAT32 partition at the beginning of your SD Card and copy files:
+     - boot.bin
+     - u-boot.img
+     - uImage
+     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
+     - devicetree.dtb (should be renamed from zynq-zc706.dtb)
+   into your SD card
+4) boot your ZC706 board
+
+You can alter the booting procedure by creating a file uEnv.txt
+in the root of the SD card. It is a plain text file in format
+<key>=<value> one per line:
+
+kernel_image=myimage
+modeboot=myboot
+myboot=...
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 746abcb..4ac2fe8 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -17,10 +17,11 @@ BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="zynq_zc70x"
+BR2_TARGET_UBOOT_BOARDNAME="zynq_zc706"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2014.1"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="boot.bin"
+BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
-- 
1.9.1

[Buildroot] [PATCH 7/7] zynq: unify readme.txt for all Zynq boards

[Masahiro Yamada]

The readme.txt for the three boards are almost the same, so merge
them into board/zynq/readme.txt.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 board/avnet/microzed/readme.txt | 33 --------------------------
 board/avnet/zedboard/readme.txt | 28 ----------------------
 board/xilinx/zc706/readme.txt   | 29 -----------------------
 board/zynq/readme.txt           | 52 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 90 deletions(-)
 delete mode 100644 board/avnet/microzed/readme.txt
 delete mode 100644 board/avnet/zedboard/readme.txt
 delete mode 100644 board/xilinx/zc706/readme.txt
 create mode 100644 board/zynq/readme.txt

diff --git a/board/avnet/microzed/readme.txt b/board/avnet/microzed/readme.txt
deleted file mode 100644
index 927e97a..0000000
--- a/board/avnet/microzed/readme.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-This is the buildroot board support for the Avnet Microzed. The Microzed is
-a development board based on the Xilinx Zynq-7000 based All-Programmable
-System-On-Chip.
-
-Microzed information including schematics, reference designs, and manuals are
-available from http://www.zedboard.org .
-
-Steps to create a working system for Microzed:
-
-1) make zynq_microzed_defconfig
-2) make
-2) make
-3) All needed files will be available in the output/images directory.
-   Create a FAT32 partition at the beginning of your SD Card and copy files:
-     - boot.bin
-     - u-boot.img
-     - uImage
-     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
-     - devicetree.dtb (should be renamed from zynq-zed.dtb)
-   into your SD card
-4) boot your Microzed
-
-Note th at the DTB (zynq-zed.dtb) is the same as the one used for the
-Zedboard, and that this is the recommended solution, see
-https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856.
-
-You can alter the booting procedure by creating a file uEnv.txt
-in the root of the SD card. It is a plain text file in format
-<key>=<value> one per line:
-
-kernel_image=myimage
-modeboot=myboot
-myboot=...
diff --git a/board/avnet/zedboard/readme.txt b/board/avnet/zedboard/readme.txt
deleted file mode 100644
index b2c30a3..0000000
--- a/board/avnet/zedboard/readme.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-This is the buildroot board support for the Avnet Zedboard. The Zedboard is
-a development board based on the Xilinx Zynq-7000 based All-Programmable
-System-On-Chip.
-
-Zedboard information including schematics, reference designs, and manuals are
-available from http://www.zedboard.org .
-
-Steps to create a working system for Zedboard:
-
-1) make zynq_zed_defconfig
-2) make
-3) All needed files will be available in the output/images directory.
-   Create a FAT32 partition at the beginning of your SD Card and copy files:
-     - boot.bin
-     - u-boot.img
-     - uImage
-     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
-     - devicetree.dtb (should be renamed from zynq-zed.dtb)
-   into your SD card
-4) boot your Zedboard
-
-You can alter the booting procedure by creating a file uEnv.txt
-in the root of the SD card. It is a plain text file in format
-<key>=<value> one per line:
-
-kernel_image=myimage
-modeboot=myboot
-myboot=...
diff --git a/board/xilinx/zc706/readme.txt b/board/xilinx/zc706/readme.txt
deleted file mode 100644
index 5034658..0000000
--- a/board/xilinx/zc706/readme.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-This is the Buildroot board support for the Xilinx ZC706. The ZC706 is
-a development board based on the Xilinx Zynq-7000 based
-All-Programmable System-On-Chip.
-
-ZC706 information including schematics, reference designs, and manuals
-are available from
-http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html.
-
-Steps to create a working system for ZC706 board:
-
-1) make zynq_zc706_defconfig
-2) make
-3) All needed files will be available in the output/images directory.
-   Create a FAT32 partition at the beginning of your SD Card and copy files:
-     - boot.bin
-     - u-boot.img
-     - uImage
-     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
-     - devicetree.dtb (should be renamed from zynq-zc706.dtb)
-   into your SD card
-4) boot your ZC706 board
-
-You can alter the booting procedure by creating a file uEnv.txt
-in the root of the SD card. It is a plain text file in format
-<key>=<value> one per line:
-
-kernel_image=myimage
-modeboot=myboot
-myboot=...
diff --git a/board/zynq/readme.txt b/board/zynq/readme.txt
new file mode 100644
index 0000000..73f8bf3
--- /dev/null
+++ b/board/zynq/readme.txt
@@ -0,0 +1,52 @@
+This is the Buildroot support for Zynq boards.  Zynq boards are available from
+Xilinx and some third party vendors, but the build procedure is very similar.
+
+Currently, three boards are natively supported by Buildroot:
+ - Xilinx ZC706 board (zynq_zc706_defconfig)
+ - Avnet ZedBoard (zynq_zed_defconfig)
+ - Avnet MicroZed (zynq_microzed_defconfig)
+
+The following build procedure focuses on them, but you can adjust it to your
+board even if it is not listed above.  Major Zynq-based boards are supported by
+U-Boot, and their Device Trees are merged in Linux Kernel.  If your board is the
+case, booting the kernel is a piece of cake.  All you need to do is to change:
+ - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME)
+ - U-Boot board defconfig (BR2_TARGET_UBOOT_BOARDNAME)
+
+Steps to create a working system for a Zynq board:
+
+1) Configuration (do one of the followings)
+    make zynq_zc706_defconfig     (ZC706)
+    make zynq_zed_defconfig       (Zedboard)
+    make zynq_microzed_defconfig  (MicroZed)
+2) make
+3) All needed files will be available in the output/images directory.
+   Create a FAT32 partition at the beginning of your SD Card and copy files:
+     - boot.bin
+     - u-boot.img
+     - uImage
+     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
+     - devicetree.dtb (should be renamed from zynq-***.dtb)
+   into your SD card
+4) boot your board
+
+You can alter the booting procedure by creating a file uEnv.txt
+in the root of the SD card. It is a plain text file in format
+<key>=<value> one per line:
+
+kernel_image=myimage
+modeboot=myboot
+myboot=...
+
+Note:
+The DTB for MicroZed is the same as the one for the Zedboard (zynq-zed.dtb),
+and this is the recommended solution, see
+https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856.
+
+References:
+ - ZC706 information including schematics, reference designs, and manuals are
+   available from
+   http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html.
+
+ - Zedboard/Microzed information including schematics, reference designs, and
+   manuals are available from http://www.zedboard.org .
-- 
1.9.1

[Buildroot] [PATCH 1/7] zynq_zed: bump Linux to xilinx-v2016.2

[Matthew Weber]

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 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>
> ---
>
>  configs/zynq_zed_defconfig | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index d3cfa70..98b010e 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -1,13 +1,12 @@
>  BR2_arm=y
>  BR2_cortex_a9=y
>  BR2_ARM_ENABLE_NEON=y
> -# Linux headers same as kernel, a 3.18 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
>  BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
>  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

>  BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
>  BR2_LINUX_KERNEL_UIMAGE=y
>  BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 2/7] zynq_zed: bump U-Boot to xilinx-v2016.2

[Matthew Weber]

All,

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> This is the latest release tag in the Xilinx repository, based on
> U-Boot v2016.01 in the mainline.
>
> Commit 46d6a561be41 ("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 46d6a561be41, 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>
> ---
>
>  board/avnet/zedboard/readme.txt                    | 52 ++++------------------
>  ...eate-zedboard-specific-U-Boot-environment.patch | 45 -------------------
>  configs/zynq_zed_defconfig                         | 10 ++---
>  3 files changed, 13 insertions(+), 94 deletions(-)
>  delete mode 100644 board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
>
> diff --git a/board/avnet/zedboard/readme.txt b/board/avnet/zedboard/readme.txt
> index 01ef97c..b2c30a3 100644
> --- a/board/avnet/zedboard/readme.txt
> +++ b/board/avnet/zedboard/readme.txt
> @@ -9,52 +9,16 @@ Steps to create a working system for Zedboard:
>
>  1) make zynq_zed_defconfig
>  2) make
> -3) copy files BOOT.BIN, u-boot-dtb.img, rootfs.cpio.uboot,
> -       uImage, zynq-zed.dtb into your SD card
> +3) All needed files will be available in the output/images directory.
> +   Create a FAT32 partition at the beginning of your SD Card and copy files:
> +     - boot.bin
> +     - u-boot.img
> +     - uImage
> +     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
> +     - devicetree.dtb (should be renamed from zynq-zed.dtb)
> +   into your SD card
>  4) boot your Zedboard
>
> -The expected output:
> -
> - U-Boot SPL 2015.07 (Jul 22 2015 - 12:01:55)
> - mmc boot
> - reading system.dtb
> - spl_load_image_fat_os: error reading image system.dtb, err - -1
> - reading u-boot-dtb.img
> - reading u-boot-dtb.img
> -
> - U-Boot 2015.07 (Jul 22 2015 - 12:01:55 +0200)
> -
> - Model: Zynq ZED Board
> - I2C:   ready
> - DRAM:  ECC disabled 512 MiB
> - MMC:   zynq_sdhci: 0
> - Using default environment
> - ...
> -
> -When using an older U-Boot then 2015.07, a working ps7_init.c
> -file is required to be installed into the U-Boot directory
> -structure. From 2015.07, the major Zynq-based boards are
> -supported without any manual intervention.
> -
> -Resulting system
> -----------------
> -A FAT32 partition should be created at the beginning of the SD Card
> -and the following files should be installed:
> -       /BOOT.BIN
> -       /zynq-zed.dtb
> -       /uImage
> -       /rootfs-cpio.uboot
> -       /u-boot-dtb.img
> -
> -
> -All needed files can be taken from output/images/
> -
> -BOOT.BIN, uImage and u-boot-dtb.img are direct copies of the same files
> -available on output/images/
> -
> -There is a patch attached that redefines the U-Boot's environment
> -to work with Buildroot out-of-the-box.
> -
>  You can alter the booting procedure by creating a file uEnv.txt
>  in the root of the SD card. It is a plain text file in format
>  <key>=<value> one per line:
> diff --git a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
> deleted file mode 100644
> index 6dae31e..0000000
> --- a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -From a4c0058967a551385da5e16d2787d9f704cab225 Mon Sep 17 00:00:00 2001
> -From: Jan Viktorin <viktorin@rehivetech.com>
> -Date: Thu, 18 Jun 2015 16:26:02 +0200
> -Subject: [PATCH 2/2] zynq: Create zedboard-specific U-Boot environment
> -
> ----
> - include/configs/zynq_zed.h | 25 +++++++++++++++++++++++++
> - 1 file changed, 25 insertions(+)
> -
> -diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
> -index 946de95..2400a88 100644
> ---- a/include/configs/zynq_zed.h
> -+++ b/include/configs/zynq_zed.h
> -@@ -24,4 +24,28 @@
> -
> - #include <configs/zynq-common.h>
> -
> -+#undef CONFIG_EXTRA_ENV_SETTINGS
> -+#define CONFIG_EXTRA_ENV_SETTINGS \
> -+      "envload=mmc info && if fatload mmc 0 0x1000 uEnv.txt;"\
> -+      " then echo Importing uEnv.txt; env import -t 0x1000"  \
> -+      " $filesize; fi;\0"                                    \
> -+      "bootcmd=run envload; run $modeboot\0"                 \
> -+      "modeboot=sdboot\0"                                    \
> -+      "baudrate=115200\0"                                    \
> -+      "bootenv=uEnv.txt\0"                                   \
> -+      "devicetree_image=zynq-zed.dtb\0"                      \
> -+      "kernel_image=uImage\0"                                \
> -+      "ramdisk_image=rootfs.cpio.uboot\0"                    \
> -+      "fpga_image=system.bit\0"                              \
> -+      "sdboot=echo Booting from SD...; run fpgaboot;"        \
> -+      " fatload mmc 0 0x1000000 ${kernel_image}"             \
> -+      " && fatload mmc 0 0x2000000 ${ramdisk_image}"         \
> -+      " && fatload mmc 0 0x3000000 ${devicetree_image}"      \
> -+      " && bootm 0x1000000 0x2000000 0x3000000\0"            \
> -+      "fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image};"   \
> -+      " then echo Booting FPGA from ${fpga_image};"          \
> -+      " fpga info 0 && fpga loadb 0 0x1000000 $filesize;"    \
> -+      " else echo FPGA image ${fpga_image} was not found,"   \
> -+      " skipping...; fi;\0"
> -+
> - #endif /* __CONFIG_ZYNQ_ZED_H */
> ---
> -2.4.3
> -
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index 98b010e..84859bb 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -17,10 +17,10 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y
>  BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BOARDNAME="zynq_zed"
> -BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07"
> -BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/avnet/zedboard/uboot"
> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
>  BR2_TARGET_UBOOT_NEEDS_DTC=y
> -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
> +BR2_TARGET_UBOOT_FORMAT_IMG=y
>  BR2_TARGET_UBOOT_SPL=y
> -BR2_TARGET_UBOOT_ZYNQ_IMAGE=y
> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 3/7] zynq_microzed: bump Linux to xilinx-v2016.2

[Matthew Weber]

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 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>
> ---
>
>  configs/zynq_microzed_defconfig | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index 06d0d7f..7b44af6 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -1,13 +1,12 @@
>  BR2_arm=y
>  BR2_cortex_a9=y
>  BR2_ARM_ENABLE_NEON=y
> -# Linux headers same as kernel, a 3.18 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
>  BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
>  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

>  BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
>  BR2_LINUX_KERNEL_UIMAGE=y
>  BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 4/7] zynq_microzed: bump U-Boot to xilinx-v2016.2

[Matthew Weber]

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> This is the latest release tag in the Xilinx repository, based on
> U-Boot v2016.01 in the mainline.  To sync with the Zedboard updates,
> switch over to the Xilinx GitHub repository.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  board/avnet/microzed/readme.txt                    | 53 ++++------------------
>  ...eate-microzed-specific-U-Boot-environment.patch | 41 -----------------
>  configs/zynq_microzed_defconfig                    | 10 ++--
>  3 files changed, 14 insertions(+), 90 deletions(-)
>  delete mode 100644 board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
>
<snip>

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 5/7] zynq_zc706: bump Linux to xilinx-v2016.2

[Matthew Weber]

All,

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 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>
> ---
>
>  configs/zynq_zc706_defconfig | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index 2dc4adb..746abcb 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -2,13 +2,12 @@ BR2_arm=y
>  BR2_cortex_a9=y
>  BR2_ARM_ENABLE_VFP=y
>  BR2_ARM_ENABLE_NEON=y
> -# Linux headers same as kernel, a 3.14 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
>  BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
>  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2014.2.01"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
>  BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
>  BR2_LINUX_KERNEL_UIMAGE=y
>  BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 6/7] zynq_zc706: bump U-Boot to xilinx-v2016.2

[Matthew Weber]

All,

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> This is the latest release tag in the Xilinx repository, based on
> U-Boot v2016.01 in the mainline.  It includes proper ps7_init_gpl.c/h
> in it, so builds working SPL without any manual intervention.
>
> BR2_TARGET_UBOOT_BOARD_NAME should be changed to zynq_zc706 since
> U-Boot now has separate defconfig files for ZC702 and ZC706 boards.
>
> BR2_TARGET_UBOOT_SPL_NAME should be changed to spl/boot.bin since
> the Zynq image support for the mkimage tool was upstreamed and it
> now generates boot.bin under spl/ directory.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  board/xilinx/zc706/readme.txt | 69 +++++++++++++------------------------------
>  configs/zynq_zc706_defconfig  |  7 +++--
>  2 files changed, 25 insertions(+), 51 deletions(-)
>
> diff --git a/board/xilinx/zc706/readme.txt b/board/xilinx/zc706/readme.txt
> index b180dea..5034658 100644
> --- a/board/xilinx/zc706/readme.txt
> +++ b/board/xilinx/zc706/readme.txt
> @@ -6,51 +6,24 @@ ZC706 information including schematics, reference designs, and manuals
>  are available from
>  http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html.
>
> -uboot.bin  -- U-Boot SPL w/ Xilinx boot.bin wrapper
> ----------------------------------------------------
> -
> -Due to licensing issues, the files ps7_init.c/h are not distributed
> -with the U-Boot source code.  These files are required to make a
> -boot.bin file.
> -
> -If you already have the Xilinx tools installed, the following sequence
> -will unpack, patch and build the rfs, kernel, uboot, and uboot-spl.
> -
> -make zynq_zc706_defconfig
> -make uboot-patch
> -cp ${XILINX_SDK_LIB}/hwplatform_templates/ZC706_hw_platform/ps7_init.{c,h} \
> -   output/build/uboot-xilinx-v2014.1/board/xilinx/zynq/
> -
> -Where ${XILINX_SDK_LIB} is ${XILINX}/SDK/${VERSION}/data/embeddedsw/lib.
> -
> -After copying these files into the U-Boot source tree, you can
> -continue the build with:

Isn't this good information to still generally include somewhere in
the notes for any of the Zynq boards as if they build a custom bit
file there would be updated handoff files needing copied in.

> -
> -make
> -
> -*Notice*
> -While the build will successfully complete without the ps7_init.*
> -files, the uboot.bin file generated by this configuration will not
> -function properly on the ZC706. Therefore, it is imperative that the
> -ps7_init.* files be copied into the U-Boot source tree any time the
> -clean, or uboot-dirclean targets are executed.
> -
> -Resulting system
> -----------------
> -
> -A FAT32 partition should be created at the beggining of the SD Card
> -and the following files should be installed:
> -
> -- boot.bin
> -- devicetree.dtb
> -- uImage
> -- uramdisk.image.gz
> -- u-boot.img
> -
> -All needed files can be taken from <output>/images/
> -
> -cp <output>/images/boot.bin /media/sdcard/
> -cp <output>/images/uImage /media/sdcard/
> -cp <output>/images/u-boot.img /media/sdcard/
> -cp <output>/images/zynq-zc706.dtb /media/sdcard/devicetree.dtb
> -cp <output>/images/rootfs.cpio.uboot /media/sdcard/uramdisk.image.gz
> +Steps to create a working system for ZC706 board:
> +
> +1) make zynq_zc706_defconfig
> +2) make
> +3) All needed files will be available in the output/images directory.
> +   Create a FAT32 partition at the beginning of your SD Card and copy files:
> +     - boot.bin
> +     - u-boot.img
> +     - uImage
> +     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
> +     - devicetree.dtb (should be renamed from zynq-zc706.dtb)
> +   into your SD card
> +4) boot your ZC706 board
> +
> +You can alter the booting procedure by creating a file uEnv.txt
> +in the root of the SD card. It is a plain text file in format
> +<key>=<value> one per line:
> +
> +kernel_image=myimage
> +modeboot=myboot
> +myboot=...
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index 746abcb..4ac2fe8 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -17,10 +17,11 @@ BR2_TARGET_ROOTFS_CPIO=y
>  BR2_TARGET_ROOTFS_CPIO_GZIP=y
>  BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
>  BR2_TARGET_UBOOT=y
> -BR2_TARGET_UBOOT_BOARDNAME="zynq_zc70x"
> +BR2_TARGET_UBOOT_BOARDNAME="zynq_zc706"
>  BR2_TARGET_UBOOT_CUSTOM_GIT=y
>  BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2014.1"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
> +BR2_TARGET_UBOOT_NEEDS_DTC=y
>  BR2_TARGET_UBOOT_FORMAT_IMG=y
>  BR2_TARGET_UBOOT_SPL=y
> -BR2_TARGET_UBOOT_SPL_NAME="boot.bin"
> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 7/7] zynq: unify readme.txt for all Zynq boards

[Matthew Weber]

All,

On Mon, Jul 18, 2016 at 4:38 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> The readme.txt for the three boards are almost the same, so merge
> them into board/zynq/readme.txt.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  board/avnet/microzed/readme.txt | 33 --------------------------
>  board/avnet/zedboard/readme.txt | 28 ----------------------
>  board/xilinx/zc706/readme.txt   | 29 -----------------------
>  board/zynq/readme.txt           | 52 +++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 52 insertions(+), 90 deletions(-)
>  delete mode 100644 board/avnet/microzed/readme.txt
>  delete mode 100644 board/avnet/zedboard/readme.txt
>  delete mode 100644 board/xilinx/zc706/readme.txt
>  create mode 100644 board/zynq/readme.txt
>
> diff --git a/board/avnet/microzed/readme.txt b/board/avnet/microzed/readme.txt
> deleted file mode 100644
> index 927e97a..0000000
> --- a/board/avnet/microzed/readme.txt
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -This is the buildroot board support for the Avnet Microzed. The Microzed is
> -a development board based on the Xilinx Zynq-7000 based All-Programmable
> -System-On-Chip.
> -
> -Microzed information including schematics, reference designs, and manuals are
> -available from http://www.zedboard.org .
> -
> -Steps to create a working system for Microzed:
> -
> -1) make zynq_microzed_defconfig
> -2) make
> -2) make
> -3) All needed files will be available in the output/images directory.
> -   Create a FAT32 partition at the beginning of your SD Card and copy files:
> -     - boot.bin
> -     - u-boot.img
> -     - uImage
> -     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
> -     - devicetree.dtb (should be renamed from zynq-zed.dtb)
> -   into your SD card
> -4) boot your Microzed
> -
> -Note th at the DTB (zynq-zed.dtb) is the same as the one used for the
> -Zedboard, and that this is the recommended solution, see
> -https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856.
> -
> -You can alter the booting procedure by creating a file uEnv.txt
> -in the root of the SD card. It is a plain text file in format
> -<key>=<value> one per line:
> -
> -kernel_image=myimage
> -modeboot=myboot
> -myboot=...
> diff --git a/board/avnet/zedboard/readme.txt b/board/avnet/zedboard/readme.txt
> deleted file mode 100644
> index b2c30a3..0000000
> --- a/board/avnet/zedboard/readme.txt
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -This is the buildroot board support for the Avnet Zedboard. The Zedboard is
> -a development board based on the Xilinx Zynq-7000 based All-Programmable
> -System-On-Chip.
> -
> -Zedboard information including schematics, reference designs, and manuals are
> -available from http://www.zedboard.org .
> -
> -Steps to create a working system for Zedboard:
> -
> -1) make zynq_zed_defconfig
> -2) make
> -3) All needed files will be available in the output/images directory.
> -   Create a FAT32 partition at the beginning of your SD Card and copy files:
> -     - boot.bin
> -     - u-boot.img
> -     - uImage
> -     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
> -     - devicetree.dtb (should be renamed from zynq-zed.dtb)
> -   into your SD card
> -4) boot your Zedboard
> -
> -You can alter the booting procedure by creating a file uEnv.txt
> -in the root of the SD card. It is a plain text file in format
> -<key>=<value> one per line:
> -
> -kernel_image=myimage
> -modeboot=myboot
> -myboot=...
> diff --git a/board/xilinx/zc706/readme.txt b/board/xilinx/zc706/readme.txt
> deleted file mode 100644
> index 5034658..0000000
> --- a/board/xilinx/zc706/readme.txt
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -This is the Buildroot board support for the Xilinx ZC706. The ZC706 is
> -a development board based on the Xilinx Zynq-7000 based
> -All-Programmable System-On-Chip.
> -
> -ZC706 information including schematics, reference designs, and manuals
> -are available from
> -http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html.
> -
> -Steps to create a working system for ZC706 board:
> -
> -1) make zynq_zc706_defconfig
> -2) make
> -3) All needed files will be available in the output/images directory.
> -   Create a FAT32 partition at the beginning of your SD Card and copy files:
> -     - boot.bin
> -     - u-boot.img
> -     - uImage
> -     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
> -     - devicetree.dtb (should be renamed from zynq-zc706.dtb)
> -   into your SD card
> -4) boot your ZC706 board
> -
> -You can alter the booting procedure by creating a file uEnv.txt
> -in the root of the SD card. It is a plain text file in format
> -<key>=<value> one per line:
> -
> -kernel_image=myimage
> -modeboot=myboot
> -myboot=...
> diff --git a/board/zynq/readme.txt b/board/zynq/readme.txt
> new file mode 100644
> index 0000000..73f8bf3
> --- /dev/null
> +++ b/board/zynq/readme.txt
> @@ -0,0 +1,52 @@
> +This is the Buildroot support for Zynq boards.  Zynq boards are available from
> +Xilinx and some third party vendors, but the build procedure is very similar.
> +
> +Currently, three boards are natively supported by Buildroot:
> + - Xilinx ZC706 board (zynq_zc706_defconfig)
> + - Avnet ZedBoard (zynq_zed_defconfig)
> + - Avnet MicroZed (zynq_microzed_defconfig)
> +
> +The following build procedure focuses on them, but you can adjust it to your
> +board even if it is not listed above.  Major Zynq-based boards are supported by
> +U-Boot, and their Device Trees are merged in Linux Kernel.  If your board is the
> +case, booting the kernel is a piece of cake.  All you need to do is to change:
> + - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME)
> + - U-Boot board defconfig (BR2_TARGET_UBOOT_BOARDNAME)
> +
> +Steps to create a working system for a Zynq board:
> +
> +1) Configuration (do one of the followings)
> +    make zynq_zc706_defconfig     (ZC706)
> +    make zynq_zed_defconfig       (Zedboard)
> +    make zynq_microzed_defconfig  (MicroZed)
> +2) make
> +3) All needed files will be available in the output/images directory.
> +   Create a FAT32 partition at the beginning of your SD Card and copy files:
> +     - boot.bin
> +     - u-boot.img
> +     - uImage
> +     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
> +     - devicetree.dtb (should be renamed from zynq-***.dtb)
> +   into your SD card
> +4) boot your board
> +
> +You can alter the booting procedure by creating a file uEnv.txt
> +in the root of the SD card. It is a plain text file in format
> +<key>=<value> one per line:
> +
> +kernel_image=myimage
> +modeboot=myboot
> +myboot=...
> +
> +Note:
> +The DTB for MicroZed is the same as the one for the Zedboard (zynq-zed.dtb),
> +and this is the recommended solution, see
> +https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856.
> +

See patch 6 of this series, I think you may want to pull the
instructions for custom handoff files over to here.

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

> +References:
> + - ZC706 information including schematics, reference designs, and manuals are
> +   available from
> +   http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html.
> +
> + - Zedboard/Microzed information including schematics, reference designs, and
> +   manuals are available from http://www.zedboard.org .
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

[Buildroot] [PATCH 6/7] zynq_zc706: bump U-Boot to xilinx-v2016.2

[Thomas Petazzoni]

Hello,

On Thu, 28 Jul 2016 12:47:39 -0500, Matthew Weber wrote:

> > -If you already have the Xilinx tools installed, the following sequence
> > -will unpack, patch and build the rfs, kernel, uboot, and uboot-spl.
> > -
> > -make zynq_zc706_defconfig
> > -make uboot-patch
> > -cp ${XILINX_SDK_LIB}/hwplatform_templates/ZC706_hw_platform/ps7_init.{c,h} \
> > -   output/build/uboot-xilinx-v2014.1/board/xilinx/zynq/
> > -
> > -Where ${XILINX_SDK_LIB} is ${XILINX}/SDK/${VERSION}/data/embeddedsw/lib.
> > -
> > -After copying these files into the U-Boot source tree, you can
> > -continue the build with:  
> 
> Isn't this good information to still generally include somewhere in
> the notes for any of the Zynq boards as if they build a custom bit
> file there would be updated handoff files needing copied in.

These manual steps are no longer needed with the new U-Boot version, so
removing those details makes sense.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 0/7] zynq: bump all Zynq boards to newest U-Boot, Linux, unifying readme.txt

[Thomas Petazzoni]

Hello,

On Mon, 18 Jul 2016 18:38:16 +0900, Masahiro Yamada wrote:

> Currently, Buildroot supports three Zynq boards.  This series bumps
> all of them to the latest U-Boot and Linux which are available in
> the Xilinx GitHub repository.
> 
> Building systems for Zynq boards is getting easy and easy.  With this
> series, we need no more manual intervention, no more local patches.
> 
> Also, three similar readme files are merged together.  Maintaining
> the documents will be easier too.
> 
> After bumped to the same version, the build procedure is almost the
> same for the Zynq-based boards.  The difference is only in U-Boot
> board defconfig and the Device Tree file name.  This applies to other
> Zynq boards that are not supported by Buildroot natively.
> 
> So, I come up with one question; how many defconfigs we want to
> support for similar build steps?  I know the support for Zynq Zybo
> board is being proposed.
> 
> We can boot the system on Zybo board, starting from zynq_zed_defconfig,
> by changing two options from "make menuconfig":
> BR2_LINUX_KERNEL_INTREE_DTS_NAME=zynq-zybo
> BR2_TARGET_UBOOT_BOARDNAME=zynq_zybo

Thanks, I've applied the entire patch series. To be honest, I was not
sure with your change moving from the mainline U-Boot back to the
Xilinx-specific U-Boot. In general, we try to use the mainline version
of the Linux kernel or U-Boot. But since the patches have been sent
some time ago, and nobody else commented, I took your approach.

One thing that would be good it to add genimage support to
automatically generate the SD card image with the VFAT partition.

Also, why is an initramfs use, rather than a more standard filesystem
like ext4 on a second partition of the SD card?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 6/7] zynq_zc706: bump U-Boot to xilinx-v2016.2

[Matthew Weber]

Thomas,

On Saturday, July 30, 2016, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Thu, 28 Jul 2016 12:47:39 -0500, Matthew Weber wrote:
>
>> > -If you already have the Xilinx tools installed, the following sequence
>> > -will unpack, patch and build the rfs, kernel, uboot, and uboot-spl.
>> > -
>> > -make zynq_zc706_defconfig
>> > -make uboot-patch
>> > -cp
${XILINX_SDK_LIB}/hwplatform_templates/ZC706_hw_platform/ps7_init.{c,h} \
>> > -   output/build/uboot-xilinx-v2014.1/board/xilinx/zynq/
>> > -
>> > -Where ${XILINX_SDK_LIB} is
${XILINX}/SDK/${VERSION}/data/embeddedsw/lib.
>> > -
>> > -After copying these files into the U-Boot source tree, you can
>> > -continue the build with:
>>
>> Isn't this good information to still generally include somewhere in
>> the notes for any of the Zynq boards as if they build a custom bit
>> file there would be updated handoff files needing copied in.
>
> These manual steps are no longer needed with the new U-Boot version, so
> removing those details makes sense.

I agree with regards to the default devkit setup, but any custom FPGA
development can affect the ps7_init file.  I'll submit a patch to provide
guidance for how to pull in the files and to define the situation that
requires those steps.


>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>

-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure
Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted Third
Party Intellectual Property (TPIP) content must be encrypted and sent to
matthew.weber at corp.rockwellcollins.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160730/16ce8ba7/attachment.html>

[Buildroot] [PATCH 6/7] zynq_zc706: bump U-Boot to xilinx-v2016.2

[Thomas Petazzoni]

Hello,

On Sat, 30 Jul 2016 14:05:16 -0500, Matthew Weber wrote:

> I agree with regards to the default devkit setup, but any custom FPGA
> development can affect the ps7_init file.  I'll submit a patch to provide
> guidance for how to pull in the files and to define the situation that
> requires those steps.

OK, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 6/7] zynq_zc706: bump U-Boot to xilinx-v2016.2

[Masahiro Yamada]

Hi.



2016-07-31 4:26 GMT+09:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Hello,
>
> On Sat, 30 Jul 2016 14:05:16 -0500, Matthew Weber wrote:
>
>> I agree with regards to the default devkit setup, but any custom FPGA
>> development can affect the ps7_init file.  I'll submit a patch to provide
>> guidance for how to pull in the files and to define the situation that
>> requires those steps.
>
> OK, thanks!
>


Oh dear, I was about to send v2,
but looks like I was a little late.


As requested by Matthew, I wrote how to use custom ps7_init
based on the latest U-Boot.

Also, I noticed the U-Boot was still stuck to the legacy
config system, so made it switch to Kconfig.


I wish I could have sent it a bit earlier...
Anyway, I've just posted a follow-up one that can be
applied to the mainline.  Please check it out.




-- 
Best Regards
Masahiro Yamada