aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGravatar Erico Nunes <nunes.erico@gmail.com>2015-12-28 23:52:05 -0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-29 18:03:22 +0100
commit53c1dadbcc4891d619b4efd067747ecd57810272 (patch)
treedd752a9abc70a569d92828770a460bb1209b0d33 /board
parent5cc14edba9ac894680221e48cfc1bf669af86391 (diff)
downloadbuildroot-53c1dadbcc4891d619b4efd067747ecd57810272.tar.gz
buildroot-53c1dadbcc4891d619b4efd067747ecd57810272.tar.bz2
configs: update cubieboard2 defconfig
This patch updates the Cubieboard2 board defconfig to use newer u-boot and linux versions, along with a few other improvements. The other improvements were mostly backported from the recent Orange Pi defconfig inclusion and are related to image generation. linux-sunxi.org was used as a reference for both linux and u-boot defconfig names. In detail: - Update linux to vanilla upstream -- currently 4.3.3 is the most up-to-date. Although it lacks some features present only in the linux-sunxi 3.4 branch, upstream support appears to be relatively mature and is already being deployed by default by distributions such as Arch Linux ARM. - Update u-boot to vanilla upstream 2015.10. According to linux-sunxi.org, upstream fully supports major functions (except NAND) since 2015.07. - Change image format to zImage and drop custom image generation script in favour of genimage, as pointed out by reviewers in the Orange Pi defconfig submission. This was tested in a Cubieboard2 board with boot from mmc and it boots fine to login prompt. This has not been tested in a Cubieboard (A10) as I don't own any; the version bumps probably apply to it although there are some differences (lack of VFPv4 support, Cortex-A8 instead of Cortex-A7), so I have kept the current Cubieboard defconfig and its scripts. This one has been only build-tested. Signed-off-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board')
-rw-r--r--board/cubietech/cubieboard2/boot.cmd5
-rw-r--r--board/cubietech/cubieboard2/genimage.cfg36
-rwxr-xr-xboard/cubietech/cubieboard2/post-build.sh11
-rwxr-xr-xboard/cubietech/cubieboard2/post-image.sh16
4 files changed, 68 insertions, 0 deletions
diff --git a/board/cubietech/cubieboard2/boot.cmd b/board/cubietech/cubieboard2/boot.cmd
new file mode 100644
index 0000000000..a9ae0e24e6
--- /dev/null
+++ b/board/cubietech/cubieboard2/boot.cmd
@@ -0,0 +1,5 @@
+setenv fdt_high ffffffff
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun7i-a20-cubieboard2.dtb
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/board/cubietech/cubieboard2/genimage.cfg b/board/cubietech/cubieboard2/genimage.cfg
new file mode 100644
index 0000000000..8929a721e5
--- /dev/null
+++ b/board/cubietech/cubieboard2/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the Cubieboard2
+# Based in the Orange Pi genimage.cfg
+
+image boot.vfat {
+ vfat {
+ files = {
+ "zImage",
+ "sun7i-a20-cubieboard2.dtb",
+ "boot.scr"
+ }
+ }
+ size = 10M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot-sunxi-with-spl.bin"
+ offset = 8192
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ size = 512M
+ }
+}
diff --git a/board/cubietech/cubieboard2/post-build.sh b/board/cubietech/cubieboard2/post-build.sh
new file mode 100755
index 0000000000..465d493c08
--- /dev/null
+++ b/board/cubietech/cubieboard2/post-build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# post-build.sh for Cubieboard2
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
+BOOT_CMD=$BOARD_DIR/boot.cmd
+BOOT_CMD_H=$BINARIES_DIR/boot.scr
+
+# U-Boot script
+$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
diff --git a/board/cubietech/cubieboard2/post-image.sh b/board/cubietech/cubieboard2/post-image.sh
new file mode 100755
index 0000000000..9cca1b1789
--- /dev/null
+++ b/board/cubietech/cubieboard2/post-image.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+ --rootpath "${TARGET_DIR}" \
+ --tmppath "${GENIMAGE_TMP}" \
+ --inputpath "${BINARIES_DIR}" \
+ --outputpath "${BINARIES_DIR}" \
+ --config "${GENIMAGE_CFG}"
+
+exit $?