[Buildroot] [PATCH] socfpga-cyclone5 Dev board support

[Buildroot] [PATCH] socfpga-cyclone5 Dev board support

[Charles Manning]

This is somewhat derived from the SocKit booard support.

It uses a fresher Linux and u-boot than SocKit. It also speeds the
serial port up to 115200.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---
 board/altera/cyclone5/post-image.sh |   10 ++++++++++
 board/altera/cyclone5/readme.txt    |    3 +++
 configs/altera_cyclone5_defconfig   |   29 +++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100755 board/altera/cyclone5/post-image.sh
 create mode 100644 board/altera/cyclone5/readme.txt
 create mode 100644 configs/altera_cyclone5_defconfig

diff --git a/board/altera/cyclone5/post-image.sh b/board/altera/cyclone5/post-image.sh
new file mode 100755
index 0000000..ad70922
--- /dev/null
+++ b/board/altera/cyclone5/post-image.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Altera Cyclone 5 Development Board post processing.
+#
+# A rip-off of the Sockit board support
+# 2014, "Roman Diouskine" <roman.diouskine@savoirfairelinux.com>
+# 2014, "Sebastien Bourdelin" <sebastien.bourdelin@savoirfairelinux.com>
+
+# create a DTB file copy with the name expected by the u-boot config
+cp -af $BINARIES_DIR/socfpga_cyclone5_socdk.dtb  $BINARIES_DIR/socfpga.dtb
diff --git a/board/altera/cyclone5/readme.txt b/board/altera/cyclone5/readme.txt
new file mode 100644
index 0000000..fe5a758
--- /dev/null
+++ b/board/altera/cyclone5/readme.txt
@@ -0,0 +1,3 @@
+Modifications to make a Cyclone 5 setup. This is derived from the buildroot
+config first done for SocKit board. See boards/altera/sockit
+
diff --git a/configs/altera_cyclone5_defconfig b/configs/altera_cyclone5_defconfig
new file mode 100644
index 0000000..df3b8c6
--- /dev/null
+++ b/configs/altera_cyclone5_defconfig
@@ -0,0 +1,29 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_EABIHF=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_FPU_NEON=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.13.5"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/cyclone5/post-image.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.rocketboards.org/linux-socfpga.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
+BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
+BR2_LINUX_KERNEL_ZIMAGE=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socdk"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_3=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.rocketboards.org/u-boot-socfpga.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_socfpga_v2013.01.01_14.02.02"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="board/altera/cyclone5"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
-- 
1.7.9.5

[Buildroot] [PATCH] socfpga-cyclone5 Dev board support

[Arnout Vandecappelle]

On 06/05/14 04:19, Charles Manning wrote:
> This is somewhat derived from the SocKit booard support.
> 
> It uses a fresher Linux and u-boot than SocKit. It also speeds the
> serial port up to 115200.
> 
> Signed-off-by: Charles Manning <cdhmanning@gmail.com>

 Hi Charles,

 Sorry for the late response - better late than never :).

 Basically, it looks good to me, so

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

but I have some minor comments below.

> ---
>  board/altera/cyclone5/post-image.sh |   10 ++++++++++
>  board/altera/cyclone5/readme.txt    |    3 +++
>  configs/altera_cyclone5_defconfig   |   29 +++++++++++++++++++++++++++++
>  3 files changed, 42 insertions(+)
>  create mode 100755 board/altera/cyclone5/post-image.sh
>  create mode 100644 board/altera/cyclone5/readme.txt
>  create mode 100644 configs/altera_cyclone5_defconfig
> 
> diff --git a/board/altera/cyclone5/post-image.sh b/board/altera/cyclone5/post-image.sh
> new file mode 100755
> index 0000000..ad70922
> --- /dev/null
> +++ b/board/altera/cyclone5/post-image.sh
> @@ -0,0 +1,10 @@
> +#!/bin/sh
> +#
> +# Altera Cyclone 5 Development Board post processing.
> +#
> +# A rip-off of the Sockit board support
> +# 2014, "Roman Diouskine" <roman.diouskine@savoirfairelinux.com>
> +# 2014, "Sebastien Bourdelin" <sebastien.bourdelin@savoirfairelinux.com>
> +
> +# create a DTB file copy with the name expected by the u-boot config
> +cp -af $BINARIES_DIR/socfpga_cyclone5_socdk.dtb  $BINARIES_DIR/socfpga.dtb

 Since it is a single file, -a is a bit weird. And personally I'd make it an
ln -f instead, but that's a matter of taste.


> diff --git a/board/altera/cyclone5/readme.txt b/board/altera/cyclone5/readme.txt
> new file mode 100644
> index 0000000..fe5a758
> --- /dev/null
> +++ b/board/altera/cyclone5/readme.txt
> @@ -0,0 +1,3 @@
> +Modifications to make a Cyclone 5 setup. This is derived from the buildroot
> +config first done for SocKit board. See boards/altera/sockit

 Maybe it's better to copy at least part of the text from that readme, because
not all of it applies (e.g. the U-Boot patch).

> +
> diff --git a/configs/altera_cyclone5_defconfig b/configs/altera_cyclone5_defconfig
> new file mode 100644
> index 0000000..df3b8c6
> --- /dev/null
> +++ b/configs/altera_cyclone5_defconfig
> @@ -0,0 +1,29 @@
> +BR2_arm=y
> +BR2_cortex_a9=y
> +BR2_ARM_EABIHF=y
> +BR2_ARM_ENABLE_NEON=y
> +BR2_ARM_FPU_NEON=y
> +BR2_ARM_INSTRUCTIONS_THUMB2=y
> +BR2_KERNEL_HEADERS_VERSION=y
> +BR2_DEFAULT_KERNEL_VERSION="3.13.5"
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/cyclone5/post-image.sh"
> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.rocketboards.org/linux-socfpga.git"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"

 If you repost, could you try with rel_socfpga-3.16_14.09.02 ? That would of
course also mean updating the kernel headers version.

> +BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
> +BR2_LINUX_KERNEL_ZIMAGE=y
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socdk"
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_3=y
> +BR2_TARGET_UBOOT=y
> +BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.rocketboards.org/u-boot-socfpga.git"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_socfpga_v2013.01.01_14.02.02"

 Same here.


 Regards,
 Arnout

> +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="board/altera/cyclone5"
> +BR2_TARGET_UBOOT_FORMAT_IMG=y
> +BR2_TARGET_UBOOT_SPL=y
> +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH v2] configs: add altera_socdk_defconfig for Altera Cyclone 5 Development Board

[Arnout Vandecappelle]

From: Charles Manning <cdhmanning@gmail.com>

This is largely the same as altera_sockit_defconfig.

It uses a fresher Linux and u-boot than SocKit. It also speeds the
serial port up to 115200.

The post-image script is generalized by adding
BR2_ROOTFS_POST_SCRIPT_ARGS and moving it up the altera directory.
Similarly, the readme is moved up and made more generic.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v2: [Arnout] refactored with sockit, renamed to socdk (both are
    cyclone5 so that name was not distinguishing).

Build-tested that both defconfigs still work.

In an earlier review I requested to update to a more recent kernel and
bootloader. I did not do that here, since I can't test it myself.
---
 board/altera/{sockit => }/post-image.sh                     |  5 +++--
 board/altera/{sockit => }/readme.txt                        |  9 +++++++--
 configs/{altera_sockit_defconfig => altera_socdk_defconfig} | 11 +++++------
 configs/altera_sockit_defconfig                             |  3 ++-
 4 files changed, 17 insertions(+), 11 deletions(-)
 rename board/altera/{sockit => }/post-image.sh (58%)
 rename board/altera/{sockit => }/readme.txt (95%)
 copy configs/{altera_sockit_defconfig => altera_socdk_defconfig} (73%)

diff --git a/board/altera/sockit/post-image.sh b/board/altera/post-image.sh
similarity index 58%
rename from board/altera/sockit/post-image.sh
rename to board/altera/post-image.sh
index 9040808..03e7819 100755
--- a/board/altera/sockit/post-image.sh
+++ b/board/altera/post-image.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-# post-image.sh for SoCkit
+# post-image.sh for SoCkit/SoCDK
 # 2014, "Roman Diouskine" <roman.diouskine@savoirfairelinux.com>
 # 2014, "Sebastien Bourdelin" <sebastien.bourdelin@savoirfairelinux.com>
 
 # create a DTB file copy with the name expected by the u-boot config
-cp -af $BINARIES_DIR/socfpga_cyclone5_sockit.dtb  $BINARIES_DIR/socfpga.dtb
+# Name of the DTB is passed as the second argument to the script.
+cp -af $BINARIES_DIR/${2}.dtb  $BINARIES_DIR/socfpga.dtb
diff --git a/board/altera/sockit/readme.txt b/board/altera/readme.txt
similarity index 95%
rename from board/altera/sockit/readme.txt
rename to board/altera/readme.txt
index b6da489..8d5b891 100644
--- a/board/altera/sockit/readme.txt
+++ b/board/altera/readme.txt
@@ -3,7 +3,8 @@ SoCkit
 Intro
 =====
 
-This is the buildroot board support for the Arrow SoCkit Evaluation Board.
+This is the buildroot board support for the Arrow SoCkit Evaluation Board
+and the Altera Cyclone 5 Development Board.
 
 A good source of information is :
 http://www.rocketboards.org/foswiki/Documentation/ArrowSoCKitEvaluationBoard
@@ -46,6 +47,10 @@ all that is required to bring the SoCkit :
 
   $ make altera_sockit_defconfig
 
+and for the SoC Development Board :
+
+  $ make altera_sockdk_defconfig
+
 Build everything
 ----------------
 
@@ -63,7 +68,7 @@ After building, you should obtain this tree:
     ????????? rootfs.ext2
     ????????? rootfs.ext3 -> rootfs.ext2
     ????????? rootfs.tar
-    ????????? socfpga_cyclone5_sockit.dtb
+    ????????? socfpga_cyclone5_sockit.dtb or socfpga_cyclone5_socdk.dtb
     ????????? socfpga.dtb
     ????????? u-boot.img
     ????????? u-boot-spl.bin
diff --git a/configs/altera_sockit_defconfig b/configs/altera_socdk_defconfig
similarity index 73%
copy from configs/altera_sockit_defconfig
copy to configs/altera_socdk_defconfig
index 888fccf..5a27a74 100644
--- a/configs/altera_sockit_defconfig
+++ b/configs/altera_socdk_defconfig
@@ -11,17 +11,17 @@ BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.13.5"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
 
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/sockit/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.rocketboards.org/linux-socfpga.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
 BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
+BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_sockit"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socdk"
 
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_3=y
@@ -30,8 +30,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.rocketboards.org/u-boot-socfpga.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_acds13.0sp1"
-BR2_TARGET_UBOOT_PATCH="board/altera/sockit"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_socfpga_v2013.01.01_14.02.02"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
diff --git a/configs/altera_sockit_defconfig b/configs/altera_sockit_defconfig
index 888fccf..dfb895e 100644
--- a/configs/altera_sockit_defconfig
+++ b/configs/altera_sockit_defconfig
@@ -12,7 +12,8 @@ BR2_DEFAULT_KERNEL_VERSION="3.13.5"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
 
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/sockit/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-- 
2.1.4

[Buildroot] [PATCH v2] configs: add altera_socdk_defconfig for Altera Cyclone 5 Development Board

[Thomas Petazzoni]

Dear Arnout Vandecappelle (Essensium/Mind),

On Mon, 13 Jul 2015 00:00:31 +0200, Arnout Vandecappelle
(Essensium/Mind) wrote:
> From: Charles Manning <cdhmanning@gmail.com>
> 
> This is largely the same as altera_sockit_defconfig.
> 
> It uses a fresher Linux and u-boot than SocKit. It also speeds the
> serial port up to 115200.
> 
> The post-image script is generalized by adding
> BR2_ROOTFS_POST_SCRIPT_ARGS and moving it up the altera directory.
> Similarly, the readme is moved up and made more generic.
> 
> Signed-off-by: Charles Manning <cdhmanning@gmail.com>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> v2: [Arnout] refactored with sockit, renamed to socdk (both are
>     cyclone5 so that name was not distinguishing).

Applied, thanks.

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