[Buildroot] [PATCH 1/2] orangepipc: rename to orangepi-pc

[Buildroot] [PATCH 1/2] orangepipc: rename to orangepi-pc

[Sergey Matyukevich]

Rename orangepipc files, configs, and directories:
- oragepipc_defconfig -> orangepi_pc_defconfig
- board/orangepi/orangepipc -> board/orangepi/orangepi-pc

The purpose of the patch is to improve readability before
adding other boards of orangepi family.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 DEVELOPERS                                               | 2 +-
 board/orangepi/{orangepipc => orangepi-pc}/boot.cmd      | 0
 board/orangepi/{orangepipc => orangepi-pc}/genimage.cfg  | 0
 board/orangepi/{orangepipc => orangepi-pc}/post-build.sh | 0
 board/orangepi/{orangepipc => orangepi-pc}/post-image.sh | 0
 board/orangepi/{orangepipc => orangepi-pc}/readme.txt    | 2 +-
 configs/{orangepipc_defconfig => orangepi_pc_defconfig}  | 4 ++--
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename board/orangepi/{orangepipc => orangepi-pc}/boot.cmd (100%)
 rename board/orangepi/{orangepipc => orangepi-pc}/genimage.cfg (100%)
 rename board/orangepi/{orangepipc => orangepi-pc}/post-build.sh (100%)
 rename board/orangepi/{orangepipc => orangepi-pc}/post-image.sh (100%)
 rename board/orangepi/{orangepipc => orangepi-pc}/readme.txt (95%)
 rename configs/{orangepipc_defconfig => orangepi_pc_defconfig} (86%)

diff --git a/DEVELOPERS b/DEVELOPERS
index 903e9a9..d855d11 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1151,7 +1151,7 @@ F:	package/libunistring/
 
 N:	Peter Korsgaard <peter@korsgaard.com>
 F:	board/orangepi/
-F:	configs/orangepipc_defconfig
+F:	configs/orangepi_pc_defconfig
 F:	package/flickcurl/
 F:	package/libfastjson/
 F:	package/lzop/
diff --git a/board/orangepi/orangepipc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd
similarity index 100%
rename from board/orangepi/orangepipc/boot.cmd
rename to board/orangepi/orangepi-pc/boot.cmd
diff --git a/board/orangepi/orangepipc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg
similarity index 100%
rename from board/orangepi/orangepipc/genimage.cfg
rename to board/orangepi/orangepi-pc/genimage.cfg
diff --git a/board/orangepi/orangepipc/post-build.sh b/board/orangepi/orangepi-pc/post-build.sh
similarity index 100%
rename from board/orangepi/orangepipc/post-build.sh
rename to board/orangepi/orangepi-pc/post-build.sh
diff --git a/board/orangepi/orangepipc/post-image.sh b/board/orangepi/orangepi-pc/post-image.sh
similarity index 100%
rename from board/orangepi/orangepipc/post-image.sh
rename to board/orangepi/orangepi-pc/post-image.sh
diff --git a/board/orangepi/orangepipc/readme.txt b/board/orangepi/orangepi-pc/readme.txt
similarity index 95%
rename from board/orangepi/orangepipc/readme.txt
rename to board/orangepi/orangepi-pc/readme.txt
index f12c867..d316b6f 100644
--- a/board/orangepi/orangepipc/readme.txt
+++ b/board/orangepi/orangepi-pc/readme.txt
@@ -12,7 +12,7 @@ How to build it
 
 Configure Buildroot:
 
-    $ make orangepipc_defconfig
+    $ make orangepi_pc_defconfig
 
 Compile everything and build the SD card image:
 
diff --git a/configs/orangepipc_defconfig b/configs/orangepi_pc_defconfig
similarity index 86%
rename from configs/orangepipc_defconfig
rename to configs/orangepi_pc_defconfig
index 6d3a842..dd21d5f 100644
--- a/configs/orangepipc_defconfig
+++ b/configs/orangepi_pc_defconfig
@@ -4,8 +4,8 @@ BR2_ARM_FPU_VFPV4=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepipc/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepipc/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3"
-- 
2.10.2

[Buildroot] [PATCH 2/2] orangepi: add basic support for orangepi-one board

[Sergey Matyukevich]

Board support package includes the following components:
- mainline u-boot 2016.09.01
- mainline kernel 4.9

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 board/orangepi/orangepi-one/boot.cmd      |  8 +++++++
 board/orangepi/orangepi-one/genimage.cfg  | 36 +++++++++++++++++++++++++++++++
 board/orangepi/orangepi-one/post-build.sh | 11 ++++++++++
 board/orangepi/orangepi-one/post-image.sh | 14 ++++++++++++
 board/orangepi/orangepi-one/readme.txt    | 29 +++++++++++++++++++++++++
 configs/orangepi_one_defconfig            | 29 +++++++++++++++++++++++++
 6 files changed, 127 insertions(+)
 create mode 100644 board/orangepi/orangepi-one/boot.cmd
 create mode 100644 board/orangepi/orangepi-one/genimage.cfg
 create mode 100755 board/orangepi/orangepi-one/post-build.sh
 create mode 100755 board/orangepi/orangepi-one/post-image.sh
 create mode 100644 board/orangepi/orangepi-one/readme.txt
 create mode 100644 configs/orangepi_one_defconfig

diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd
new file mode 100644
index 0000000..ab616e6
--- /dev/null
+++ b/board/orangepi/orangepi-one/boot.cmd
@@ -0,0 +1,8 @@
+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 sun8i-h3-orangepi-one.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg
new file mode 100644
index 0000000..4640ff2
--- /dev/null
+++ b/board/orangepi/orangepi-one/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the OrangePi PC
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-orangepi-one.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
+		size = 1040384 # 1MB - 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/orangepi/orangepi-one/post-build.sh b/board/orangepi/orangepi-one/post-build.sh
new file mode 100755
index 0000000..46e8905
--- /dev/null
+++ b/board/orangepi/orangepi-one/post-build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# post-build.sh for OrangePi One taken from CubieBoard's post-build.sh
+# 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/orangepi/orangepi-one/post-image.sh b/board/orangepi/orangepi-one/post-image.sh
new file mode 100755
index 0000000..359b4c9
--- /dev/null
+++ b/board/orangepi/orangepi-one/post-image.sh
@@ -0,0 +1,14 @@
+#!/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}"
diff --git a/board/orangepi/orangepi-one/readme.txt b/board/orangepi/orangepi-one/readme.txt
new file mode 100644
index 0000000..e650f82
--- /dev/null
+++ b/board/orangepi/orangepi-one/readme.txt
@@ -0,0 +1,29 @@
+OrangePi One
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the OrangePi One. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make orangepi_one_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
new file mode 100644
index 0000000..a486d0e
--- /dev/null
+++ b/configs/orangepi_one_defconfig
@@ -0,0 +1,29 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-one/post-image.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-- 
2.10.2

[Buildroot] [PATCH 2/2] orangepi: add basic support for orangepi-one board

[Peter Korsgaard]

>>>>> "Sergey" == Sergey Matyukevich <geomatsi@gmail.com> writes:

 > Board support package includes the following components:
 > - mainline u-boot 2016.09.01
 > - mainline kernel 4.9

 > Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
 > ---
 >  board/orangepi/orangepi-one/boot.cmd      |  8 +++++++
 >  board/orangepi/orangepi-one/genimage.cfg  | 36 +++++++++++++++++++++++++++++++
 >  board/orangepi/orangepi-one/post-build.sh | 11 ++++++++++
 >  board/orangepi/orangepi-one/post-image.sh | 14 ++++++++++++
 >  board/orangepi/orangepi-one/readme.txt    | 29 +++++++++++++++++++++++++
 >  configs/orangepi_one_defconfig            | 29 +++++++++++++++++++++++++

It is a bit annoying that we have to duplicate all files for each of the
several orangepi board variants, so I've added a patch to share the
post-build / post-image scripts and committed both patches, thanks.

 > +BR2_TARGET_UBOOT=y
 > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
 > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one"

Any specific reason to not use uboot-2016.11?

-- 
Bye, Peter Korsgaard