Altera SoCkit board support fixes

PATCH New Lucas Bajolet 2 participants 7 messages Jan 20, 2017 – Jan 24, 2017

lore

Share & tools

lore

Lucas Bajolet

author

2017-01-20 15:12 UTC #0 lore raw

v3 cover Altera SoCkit board support fixes

Hi all,

Update on the patch series to support the Altera SoCkit with modifications suggested by Thomas Petazzoni:

* The patch and config files commits have been merged into one
* The u-boot version has been rebased on a stable one

Thanks for the feedback!

Lucas Bajolet (3):
configs/altera_sockit: bump kernel to 4.7 and u-boot to v2016.11-rc3 board/altera: added genimage script to SoCkit board/altera: update README for new scripts and fixed some typos

 board/altera/genimage.cfg                          |  31 +
 board/altera/post-image.sh                         |  29 +-
 board/altera/readme.txt                            |  64 +-
 .../sockit/altera_sockit_config_buildroot.patch    |  35 +
 .../uboot-sockit-preloader-sample-design.patch     | 820 ---------------------
 configs/altera_sockit_defconfig                    |  20 +-
 6 files changed, 136 insertions(+), 863 deletions(-)
 create mode 100644 board/altera/genimage.cfg
 create mode 100644 board/altera/sockit/altera_sockit_config_buildroot.patch
 delete mode 100644 board/altera/sockit/uboot-sockit-preloader-sample-design.patch

Signature · 1 line

2.7.4

Lucas Bajolet

author

2017-01-20 15:12 UTC #1 lore raw

PATCH v3 1/3 configs/altera_sockit: bump kernel to 4.7 and u-boot to v2016.11-rc3

Altera SoCkit could not build anymore on recent versions of Buildroot due to a GCC 5+ update.

This patch solves the issue by bumping the Kernel version to 4.7, making it compatible with GCC 5+.

The bootloader is also updated to a newer version since the board is now officially supported by Altera in their U-Boot repository.

The old patch became useless, and was replaced by a new one, to fix a booting problem with the board we have, which could not load when the SPL+U-Boot were not on the first partition.

The patch also helps organize the partition table in a more natural way.

Signed-off-by Lucas Bajolet <[email protected]>

---
 .../sockit/altera_sockit_config_buildroot.patch    |  35 +
 .../uboot-sockit-preloader-sample-design.patch     | 820 ---------------------
 configs/altera_sockit_defconfig                    |  19 +-
 3 files changed, 43 insertions(+), 831 deletions(-)
 create mode 100644 board/altera/sockit/altera_sockit_config_buildroot.patch
 delete mode 100644 board/altera/sockit/uboot-sockit-preloader-sample-design.patch

board/altera/sockit/altera_sockit_config_buildroot.patch new file +35 -0

new file mode 100644
index 0000000..d2b5003
@@ -0,0 +1,35 @@
+From ba56b1703dde4e1be4e9d943722e382ad1348755 Mon Sep 17 00:00:00 2001
+From: Lucas Bajolet <[email protected]>
+Date: Thu, 12 Jan 2017 17:25:15 -0500
+Subject: [PATCH] sockfpga: Changed image and device tree partition information
+ in config
+
+Signed-off-by: Lucas Bajolet <[email protected]>
+---
+ include/configs/socfpga_sockit.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
+index 3fceb31..ccbf56c 100644
+--- a/include/configs/socfpga_sockit.h
++++ b/include/configs/socfpga_sockit.h
+@@ -42,13 +42,13 @@
+ 	"fdt_addr=100\0" \
+ 	"fdtimage=socfpga.dtb\0" \
+ 	"bootm ${loadaddr} - ${fdt_addr}\0" \
+-	"mmcroot=/dev/mmcblk0p2\0" \
++	"mmcroot=/dev/mmcblk0p3\0" \
+ 	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
+ 		" root=${mmcroot} rw rootwait;" \
+ 		"bootz ${loadaddr} - ${fdt_addr}\0" \
+ 	"mmcload=mmc rescan;" \
+-		"load mmc 0:1 ${loadaddr} ${bootimage};" \
+-		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
++		"load mmc 0:2 ${loadaddr} ${bootimage};" \
++		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
+ 	"qspiload=sf probe && mtdparts default && run ubiload\0" \
+ 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
+ 		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
+-- 
+2.7.4
+

board/altera/sockit/uboot-sockit-preloader-sample-design.patch deleted +0 ~~-820~~

820 lines not on this page · raw message

configs/altera_sockit_defconfig +8 ~~-11~~

index 0addbde..9349ebc 100644
@@ -6,32 +6,29 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_NEON=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
-# Linux headers same as kernel, a 3.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
+# Linux headers same as kernel, a 4.7 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
 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="http://git.rocketboards.org/linux-socfpga.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/altera-opensource/linux-socfpga.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-4.7_16.10.02_pr"
 BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_sockit"
 
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_3=y
 
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
+BR2_TARGET_UBOOT_BOARDNAME="socfpga_sockit"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://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_URL="https://github.com/altera-opensource/u-boot-socfpga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2016.09.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
+BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y

Signature · 1 line

2.7.4

Thomas Petazzoni

2017-01-24 05:08 UTC #2 lore raw

PATCH v3 1/3 configs/altera_sockit: bump kernel to 4.7 and u-boot to v2016.11-rc3

Hello,

The commit title is wrong: you're bumping to U-Boot 2016.09. Also, I have some other questions.

Quoted 6 lines · Lucas Bajolet

The old patch became useless, and was replaced by a new one, to fix a booting problem with the board we have, which could not load when the SPL+U-Boot were not on the first partition.
The patch also helps organize the partition table in a more natural way.

I don't understand why is the patch needed. The patch only the U-Boot environment to load the kernel/DTB from partition 2 instead of partition 1, and have the root filesystem in partition 3 instead of partition 2.

Why is this needed? A typical scenario for such platforms is often to have the first partition be a FAT partition with the bootloader, kernel image and DTB, and the second partition containing the root filesystem. Which would perfectly match the original U-Boot environment. So why change it?

board/altera/sockit/altera_sockit_config_buildroot.patch

Quoted 5 lines

board/altera/sockit/altera_sockit_config_buildroot.patch new file +0 -0
new file mode 100644
index 0000000..d2b5003

The "buildroot" part of the name is not relevant. Also, it would be better to use:

BR2_GLOBAL_PATCH_DIR=board/altera/sockit/patches

And then put your patch in board/altera/sockit/patches/uboot/

board/altera/sockit/altera_sockit_config_buildroot.patch line 5

Quoted 6 lines

board/altera/sockit/altera_sockit_config_buildroot.patch new file +5 -0

@@ -0,0 +1,35 @@
+From ba56b1703dde4e1be4e9d943722e382ad1348755 Mon Sep 17 00:00:00 2001
+From: Lucas Bajolet <[email protected]>
+Date: Thu, 12 Jan 2017 17:25:15 -0500
+Subject: [PATCH] sockfpga: Changed image and device tree partition information
+ in config

This only describes what you're doing (which everyone can see in the patch), but not *why* you're doing this.

Quoted 21 lines

configs/altera_sockit_defconfig +2 -5

index 0addbde..9349ebc 100644
@@ -6,32 +6,29 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_NEON=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
-# Linux headers same as kernel, a 3.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
+# Linux headers same as kernel, a 4.7 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
 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="http://git.rocketboards.org/linux-socfpga.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"

configs/altera_sockit_defconfig BR2_ARM_ENABLE_NEON=y · line 27

Quoted 10 lines

configs/altera_sockit_defconfig +2 -3

+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/altera-opensource/linux-socfpga.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-4.7_16.10.02_pr"
 BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_sockit"
 
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_3=y

Why are you dropping this line ?

Thanks,

Thomas

Signature · 3 lines

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

Lucas Bajolet

author

2017-01-20 15:12 UTC #3 lore raw

PATCH v3 2/3 board/altera: added genimage script to SoCkit

In reply to Lucas Bajolet

Previously, the Altera SoCkit image has to be built manually by the developer who wanted to use it.

This patch introduces a genimage.cfg file to build the image automatically when done building the files from source.

Signed-off-by Lucas Bajolet <[email protected]>

---
 board/altera/genimage.cfg       | 31 +++++++++++++++++++++++++++++++
 board/altera/post-image.sh      | 29 ++++++++++++++++++++++++++++-
 configs/altera_sockit_defconfig |  1 +
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 board/altera/genimage.cfg

board/altera/genimage.cfg new file +31 -0

new file mode 100644
index 0000000..3107939
@@ -0,0 +1,31 @@
+image rootfs-img.vfat {
+	vfat {
+		file "socfpga.dtb" {image = "socfpga_cyclone5_sockit.dtb"}
+		file "zImage" {image = "zImage"}
+	}
+
+	size = 10M
+}
+
+image sockit_image.img {
+	hdimage {
+	}
+
+	partition uboot {
+		partition-type = 0xa2
+		image = "uboot-part.img"
+		offset = 0
+	}
+
+	partition rootfs {
+		partition-type = 0xb
+		image = "rootfs-img.vfat"
+		offset = 1M
+	}
+
+	partition linux {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+		offset = 12M
+	}
+}

board/altera/post-image.sh +28 -1

index 03e7819..a9aefc9 100755
@@ -5,4 +5,31 @@
 
 # create a DTB file copy with the name expected by the u-boot config
 # Name of the DTB is passed as the second argument to the script.
-cp -af $BINARIES_DIR/${2}.dtb  $BINARIES_DIR/socfpga.dtb
+set -e
+
+BOARD_DIR=$(dirname $0)
+
+# Create SPL + bootloader image
+fallocate -l 1M $BINARIES_DIR/uboot-part.img
+dd if=$BINARIES_DIR/u-boot-spl.bin of=$BINARIES_DIR/uboot-part.img bs=64k seek=0
+dd if=$BINARIES_DIR/u-boot-spl.bin.crc of=$BINARIES_DIR/uboot-part.img bs=64k seek=1
+dd if=$BINARIES_DIR/u-boot.img of=$BINARIES_DIR/uboot-part.img bs=64k seek=4
+
+#########################################
+# Final image generation (using genimage)
+#########################################
+# Prepare data for image
+T=`mktemp -d`
+echo $T
+mkdir -p $T/root
+mkdir -p $T/tmp
+
+echo "* Generating sd-card image..."
+genimage \
+        --config $BOARD_DIR/genimage.cfg \
+        --rootpath $T/root \
+        --tmppath $T/tmp \
+        --inputpath $BINARIES_DIR \
+        --outputpath $BINARIES_DIR \
+
+rm -rf $T

configs/altera_sockit_defconfig +1 -0

index 9349ebc..fef54ac 100644
@@ -11,6 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
+BR2_PACKAGE_HOST_GENIMAGE=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

Signature · 1 line

2.7.4

Thomas Petazzoni

2017-01-24 05:13 UTC #4 lore raw

PATCH v3 2/3 board/altera: added genimage script to SoCkit

Hello,

Quoted 7 lines · Lucas Bajolet

Previously, the Altera SoCkit image has to be built manually by the developer who wanted to use it.
This patch introduces a genimage.cfg file to build the image automatically when done building the files from source.
Signed-off-by Lucas Bajolet <[email protected]>

This is really good to have.

board/altera/genimage.cfg line 1

Quoted 7 lines

board/altera/genimage.cfg new file +1 -0

new file mode 100644
index 0000000..3107939
@@ -0,0 +1,31 @@
+image rootfs-img.vfat {

This really isn't the "root filesystem".

Quoted 19 lines

board/altera/genimage.cfg new file +19 -0

+	vfat {
+		file "socfpga.dtb" {image = "socfpga_cyclone5_sockit.dtb"}
+		file "zImage" {image = "zImage"}
+	}
+
+	size = 10M
+}
+
+image sockit_image.img {
+	hdimage {
+	}
+
+	partition uboot {
+		partition-type = 0xa2
+		image = "uboot-part.img"
+		offset = 0
+	}
+
+	partition rootfs {

board/altera/genimage.cfg line 30

Quoted 10 lines

board/altera/genimage.cfg new file +10 -0

+		partition-type = 0xb
+		image = "rootfs-img.vfat"
+		offset = 1M
+	}
+
+	partition linux {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+		offset = 12M
+	}

This layout is weird, because it doesn't match the U-Boot default environment (as exposed in my review of PATCH 1/3). I imagine that if U-Boot is using partition 1 to store the kernel+DTB and partition 2 to store the root filesystem, it's because there is no need for a partition to store the bootloader itself, it can probably be stored raw at the beginning of the SD card ?

Quoted 3 lines

 # create a DTB file copy with the name expected by the u-boot config
 # Name of the DTB is passed as the second argument to the script.
-cp -af $BINARIES_DIR/${2}.dtb  $BINARIES_DIR/socfpga.dtb

So you're removing the code, but not the comment that explains what it does? This seems weird :)

board/altera/genimage.cfg

Quoted 9 lines

board/altera/genimage.cfg new file +9 -0

+set -e
+
+BOARD_DIR=$(dirname $0)
+
+# Create SPL + bootloader image
+fallocate -l 1M $BINARIES_DIR/uboot-part.img
+dd if=$BINARIES_DIR/u-boot-spl.bin of=$BINARIES_DIR/uboot-part.img bs=64k seek=0
+dd if=$BINARIES_DIR/u-boot-spl.bin.crc of=$BINARIES_DIR/uboot-part.img bs=64k seek=1
+dd if=$BINARIES_DIR/u-boot.img of=$BINARIES_DIR/uboot-part.img bs=64k seek=4

I guess this really doesn't need a partition, right?

board/altera/genimage.cfg

Quoted 8 lines

board/altera/genimage.cfg new file +8 -0

+#########################################
+# Final image generation (using genimage)
+#########################################
+# Prepare data for image
+T=`mktemp -d`
+echo $T
+mkdir -p $T/root
+mkdir -p $T/tmp

Please look at how other genimage scripts do this instead of using a different solution. See board/raspberrypi/post-image.sh for example.

configs/altera_sockit_defconfig BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y · line 14

Quoted 9 lines

configs/altera_sockit_defconfig +1 -0

index 9349ebc..fef54ac 100644
@@ -11,6 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
+BR2_PACKAGE_HOST_GENIMAGE=y

You also need:

BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_MTOOLS=y

if your genimage configuration creates a FAT partition (which it currently does).

Thanks!

Thomas

Signature · 3 lines

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

Lucas Bajolet

author

2017-01-20 15:12 UTC #5 lore raw

PATCH v3 3/3 board/altera: update README for new scripts and fixed some typos

In reply to Lucas Bajolet

The old README has a few typos which needed fixing. Also with the newer versions of U-Boot and the patch applied to the configuration, the partition table information and related commands need to be updated.

Since the post-install script now supports Genimage, a new paragraph explaining how it works has been added.

Also, removed link to mkpimage, since it is also natively supported by Buildroot as an option.

Signed-off-by Lucas Bajolet <[email protected]>

---
 board/altera/readme.txt | 64 +++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

board/altera/readme.txt +33 ~~-31~~

index 1894a79..a19ba21 100644
@@ -69,27 +69,13 @@ After building, you should obtain this tree:
 
     output/images/
     ??? rootfs.ext2
-    ??? rootfs.ext3 -> rootfs.ext2
     ??? rootfs.tar
     ??? socfpga_cyclone5_sockit.dtb or socfpga_cyclone5_socdk.dtb
-    ??? socfpga.dtb
+    ??? u-boot.bin
     ??? u-boot.img
     ??? u-boot-spl.bin
-    ??? uImage
-
-
-Signing the Preloader
----------------------
-
-*** BEWARE ****
-The u-boot-spl.bin must be signed using the Altera's tool "mkpimage".
-This tool comes as a part of the Altera development environnment (SoC EDS).
-A fork of this tool have been done by Maxime Hadjinlian and can be found here:
-https://github.com/maximeh/mkpimage
-
-Remember that without signing the u-boot-spl.bin, the board will not boot !!!
-
-  $ mkpimage u-boot-spl.bin -o u-boot-spl-signed.bin
+    ??? u-boot-spl.bin.crc
+    ??? zImage
 
 Prepare your SDcard
 ===================

@@ -111,22 +97,26 @@ let's assume it is /dev/mmcblk0:
 Delete all previous partitions with 'd' then create the new partition table,
 using these options, pressing enter after each one:
 
-  * n p 1 9000000 +20480K t 1 b
-  * n p 2 4096 +4496384K t 83
-  * n p 3 2048 +1024K t 3 a2
+  * n p 1 1 4095
+  * n p 2 4096 +22000
+  * n p 3  <Enter> -- This will take the remaining space from the SD card
+
+Then, still in fdisk, change the type of the partitions according to this
+  * t 1 a2
+  * t 2 b
 
 Using the 'p' option, the SD card's partition must look like this:
 
-Device         Boot     Start       End  Blocks  Id System
-/dev/mmcblk0p1        9000000   9041919   20960   b W95 FAT32
-/dev/mmcblk0p2           4096   8996863 4496384  83 Linux
-/dev/mmcblk0p3           2048      4095    1024  a2 Unknown
+Device         Boot     Start     End   Blocks  Id  System
+/dev/mmcblk0p1           2048    4095     2048  a2  Unknown
+/dev/mmcblk0p2           4096   26096    22001   b  W95 FAT32
+/dev/mmcblk0p3          26624 3862527  3835904  83  Linux
 
 Then write the partition table using 'w' and exit.
 
 Make partition one a DOS partition:
 
-  $ sudo mkdosfs /dev/mmcblk0p1
+  $ sudo mkdosfs /dev/mmcblk0p2
 
 Install the binaries to the SDcard
 ----------------------------------

@@ -139,27 +129,39 @@ The partition with type a2 is the partition scan by the first bootloader stage
 in the SoCkit ROM to find the next bootloader stage so we must write the signed
 preloader and the u-boot binaries in that partition:
 
-  $ sudo dd if=u-boot-spl-signed.bin of=/dev/mmcblk0p3 bs=64k seek=0
-  $ sudo dd if=u-boot.img of=/dev/mmcblk0p3 bs=64k seek=4
+  $ sudo dd if=u-boot-spl.bin of=/dev/mmcblk0p1 bs=64k seek=0
+  $ sudo dd if=u-boot-spl.bin.crc of=/dev/mmcblk0p1 bs=64k seek=1
+  $ sudo dd if=u-boot.img of=/dev/mmcblk0p1 bs=64k seek=4
 
 Copy the Linux kernel and its Device tree:
 
   $ sudo mkdir /mnt/sdcard
-  $ sudo mount /dev/mmcblk0p1 /mnt/sdcard
-  $ sudo cp socfpga.dtb uImage /mnt/sdcard
+  $ sudo mount /dev/mmcblk0p2 /mnt/sdcard
+  $ sudo cp socfpga_cyclone5_sockit.dtb /mnt/sdcard/socfpga.dtb
+  $ sudo cp zImage /mnt/sdcard
   $ sudo umount /mnt/sdcard
 
 Copy the rootfs:
 
-  $ sudo dd if=rootfs.ext2 of=/dev/mmcblk0p2 bs=64k
+  $ sudo dd if=rootfs.ext2 of=/dev/mmcblk0p3 bs=64k
   $ sudo sync
 
 It's Done!
 
+(ALT) Install the binaries to SDcard from genimage
+--------------------------------------------
+
+`genimage` will generate a `sockit_image.img` image in the output folder.
+From that point, you will need to execute the following command:
+
+   $ sudo dd if=sockit_image.img of=/dev/mmcblk0
+
+It's Done!
+
 Finish
 ======
 
 Eject your SDcard, insert it in your SoCkit, and power it up.
 
 if you want a serial console, you can plug a micro B USB cable on the USB-UART
-port, the serial port config to used is 57600/8-N-1.
+port, the serial port config to use is 115200/8-N-1.

Signature · 1 line

2.7.4

Thomas Petazzoni

2017-01-24 05:16 UTC #6 lore raw

PATCH v3 3/3 board/altera: update README for new scripts and fixed some typos

Hello,

Quoted 3 lines · Lucas Bajolet

     output/images/
     ??? rootfs.ext2
- ??? rootfs.ext3 -> rootfs.ext2

As explained in my review on PATCH 1/3, ext3 should probably be kept in the defconfig, and therefore this should be kept.

Quoted 6 lines

Prepare your SDcard
===================

board/altera/readme.txt +0 -0

@@ -111,22 +97,26 @@ let's assume it is /dev/mmcblk0:
 Delete all previous partitions with 'd' then create the new partition table,
 using these options, pressing enter after each one:

board/altera/readme.txt let's assume it is /dev/mmcblk0: · line 106

Quoted 10 lines

board/altera/readme.txt +7 -3

-  * n p 1 9000000 +20480K t 1 b
-  * n p 2 4096 +4496384K t 83
-  * n p 3 2048 +1024K t 3 a2
+  * n p 1 1 4095
+  * n p 2 4096 +22000
+  * n p 3  <Enter> -- This will take the remaining space from the SD card
+
+Then, still in fdisk, change the type of the partitions according to this
+  * t 1 a2
+  * t 2 b

Remove all this stuff that explains how to prepare the SD card. If we have a genimage script that creates a ready to use SD card image, then there is no need to re-explain all of this in the readme.txt file.

board/altera/readme.txt The partition with type a2 is the partition scan by the first bootloader stage · line 157

Quoted 7 lines

board/altera/readme.txt +7 -0

+(ALT) Install the binaries to SDcard from genimage
+--------------------------------------------
+
+`genimage` will generate a `sockit_image.img` image in the output folder.
+From that point, you will need to execute the following command:
+
+   $ sudo dd if=sockit_image.img of=/dev/mmcblk0

Please name the image sdcard.img, and use the following instruction:

sudo dd if=output/images/sdcard.img of=/dev/mmcblk0

Thanks!

Thomas

Signature · 3 lines

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