Skip to contentSkip to conversation

configs/rock64: new defconfig

PATCH New Michał Łyszczek 2 participants 2 messages Feb 6, 2019 – Feb 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 configs/rock64: new defconfig

Configuration contains:
- building tpl, spl and u-boot (forked u-boot repository)
- booting from SD card and network via PXE
- working ethernet, usb and uart
- minimal rootfs with busybox
- ready to flash SD card image

---
Changes v2 -> v3:
- sync with new ATF versioning

Changes v1 -> v2:
- add entry to DEVELOPERS file
- use proper format for included .patch file
- make use of BR2_GLOBAL_PATCH_DIR
- add board homepage to readme.txt
- use BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19 instead of

    BR2_KERNEL_HEADERS_4_19
  - use fixed version of ATF instead of latest one
  - refresh .gitlab-ci.yml
---
 .gitlab-ci.yml                                |  1 +
 DEVELOPERS                                    |  2 +
 board/pine64/rock64/extlinux.conf             |  4 +
 board/pine64/rock64/genimage.cfg              | 23 +++++
 ...328-needs-itb-image-to-boot-properly.patch | 32 +++++++
 board/pine64/rock64/post-build.sh             |  9 ++
 board/pine64/rock64/readme.txt                | 95 +++++++++++++++++++
 configs/rock64_defconfig                      | 36 +++++++
 8 files changed, 202 insertions(+)
 create mode 100644 board/pine64/rock64/extlinux.conf
 create mode 100644 board/pine64/rock64/genimage.cfg
 create mode 100644 board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
 create mode 100755 board/pine64/rock64/post-build.sh
 create mode 100644 board/pine64/rock64/readme.txt
 create mode 100644 configs/rock64_defconfig
.gitlab-ci.yml +1 -0
index 8f1e4ae804..36f18c29b4 100644
@@ -248,6 +248,7 @@ raspberrypi3_defconfig: *defconfig
 raspberrypi3_qt5we_defconfig: *defconfig
 raspberrypi_defconfig: *defconfig
 riotboard_defconfig: *defconfig
+rock64_defconfig: *defconfig
 roseapplepi_defconfig: *defconfig
 s6lx9_microboard_defconfig: *defconfig
 sheevaplug_defconfig: *defconfig
DEVELOPERS +2 -0
index c1950bb0f4..efe278c4bf 100644
@@ -1542,6 +1542,8 @@ F:	package/python-spidev/
 
 N:	Micha? ?yszczek <[email protected]>
 F:	board/altera/socrates_cyclone5/
+F:	board/pine64/rock64
+F:	configs/rock64_defconfig
 F:	configs/socrates_cyclone5_defconfig
 
 N:	Mike Harmony <[email protected]>
board/pine64/rock64/extlinux.conf new file +4 -0
new file mode 100644
index 0000000000..bf71982a9f
@@ -0,0 +1,4 @@
+label rock64-buildroot
+  kernel /boot/Image
+  devicetree /boot/rk3328-rock64.dtb
+  append console=ttyS2,1500000n8 root=/dev/mmcblk0p1 ro rootwait
board/pine64/rock64/genimage.cfg new file +23 -0
new file mode 100644
index 0000000000..0b5a0d8804
@@ -0,0 +1,23 @@
+image sdcard.img {
+    hdimage {
+    }
+
+    partition uboot-spl {
+        in-partition-table = "no"
+        image = "u-boot-tpl-spl.img"
+        offset = 32768 # 512 * 0x40 from start of sd card
+    }
+
+    partition uboot {
+        in-partition-table = "no"
+        image = "u-boot.itb"
+        offset = 262144 # 512 * 0x200 from start of sd card
+    }
+
+    partition rootfs {
+        partition-type = 0x83
+        bootable = "yes"
+        image = "rootfs.ext2"
+        size = 500M
+    }
+}
board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch new file +32 -0
new file mode 100644
index 0000000000..2d35b78daa
@@ -0,0 +1,32 @@
+From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <[email protected]>
+Date: Tue, 5 Feb 2019 22:08:54 +0100
+Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Micha? ?yszczek <[email protected]>
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 8086f3c93e..a6425b5b03 100644
+--- a/Makefile
++++ b/Makefile
+@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),)
+ ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
+ endif
+ 
++# rk3328 needs itb image to boot properly
++ifeq ($(CONFIG_ROCKCHIP_RK3328),y)
++ALL-y += u-boot.itb
++endif
++
+ # enable combined SPL/u-boot/dtb rules for tegra
+ ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
+ ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
+-- 
+2.18.1
+
board/pine64/rock64/post-build.sh new file +9 -0
new file mode 100755
index 0000000000..26b53cba8e
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOARD_DIR="$(dirname $0)"
+
+$MKIMAGE -n rk3328 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img
+cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl.bin > $BINARIES_DIR/u-boot-tpl-spl.img
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
board/pine64/rock64/readme.txt new file +95 -0

95 lines not on this page · raw message

configs/rock64_defconfig new file +36 -0
new file mode 100644
index 0000000000..29b8e9d3c5
@@ -0,0 +1,36 @@
+BR2_aarch64=y
+BR2_GLOBAL_PATCH_DIR="board/pine64/rock64/patches"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS2"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rock64/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rock64/genimage.cfg"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.19"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-rock64"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v1.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-u-boot.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2017.09-rockchip-ayufan-1035-gd646df03ac"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock64-rk3328"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin tpl/u-boot-tpl.bin"
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
Signature · 1 line
2.18.1
#1 lore raw

PATCH v3 1/1 configs/rock64: new defconfig

Hello,

Quoted 7 lines · On Wed, 6 Feb 2019 17:20:34 +0100 Micha? ?yszczek <[email protected]>…

Configuration contains:
- building tpl, spl and u-boot (forked u-boot repository)
- booting from SD card and network via PXE
- working ethernet, usb and uart
- minimal rootfs with busybox
- ready to flash SD card image

Quoted 5 lines

---
Changes v2 -> v3:
- sync with new ATF versioning

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com