[v3,1/1] configs: add raspberrypi3 64bits defconfig

Submitted by Gaël PORTAY on April 18, 2017, 3:59 p.m.

Details

Message ID 20170418155959.27129-1-gael.portay@savoirfairelinux.com
State Accepted
Commit 9bbea36e3e6f27475dd8589f087522745aa39aa5
Headers show

Commit Message

Gaël PORTAY April 18, 2017, 3:59 p.m.
This configuration builds a 64bit image for RaspberryPi 3.

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
Changes since v2:
- Set Floating Point Unit to VFPv4 (Martin Bark)

Changes since v1:
- Symlink raspberrypi3-64 and update BR2_ROOTFS_POST_[BUILD|IMAGE]_SCRIPT
- Add BR2_cortex_a53 architecture
- Set BR2_TARGET_ROOTFS_EXT2_BLOCKS to 120000
- Update kernel repository version

 board/raspberrypi/genimage-raspberrypi3-64.cfg | 31 ++++++++++++++++++++
 board/raspberrypi/post-image.sh                | 20 +++++++++++++
 board/raspberrypi3-64                          |  1 +
 configs/raspberrypi3_64_defconfig              | 39 ++++++++++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 board/raspberrypi/genimage-raspberrypi3-64.cfg
 create mode 120000 board/raspberrypi3-64
 create mode 100644 configs/raspberrypi3_64_defconfig

Comments

Ricardo Martincoski May 1, 2017, 11:34 p.m.
Hello,

On Tue, Apr 18, 2017 at 12:59 PM, Gaël PORTAY wrote:

> This configuration builds a 64bit image for RaspberryPi 3.
> 
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>

Tested-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
[build-tested: in the host 'file output/target/bin/busybox' shows
'setuid ELF 64-bit LSB executable, ARM aarch64, version 1 (SYSV)'...;
boot-tested: I can login using the HDMI console,
and in the target 'cat /proc/cpuinfo' shows 'CPU architecture: 8']

I can't test the mini UART yet, sorry.

Regards,
Ricardo
Peter Korsgaard May 4, 2017, 7:24 a.m.
>>>>> "Gaël" == Gaël PORTAY <gael.portay@savoirfairelinux.com> writes:

 > This configuration builds a 64bit image for RaspberryPi 3.
 > Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
 > ---
 > Changes since v2:
 > - Set Floating Point Unit to VFPv4 (Martin Bark)

 > Changes since v1:
 > - Symlink raspberrypi3-64 and update BR2_ROOTFS_POST_[BUILD|IMAGE]_SCRIPT
 > - Add BR2_cortex_a53 architecture
 > - Set BR2_TARGET_ROOTFS_EXT2_BLOCKS to 120000
 > - Update kernel repository version

 > diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig
 > new file mode 100644
 > index 000000000..aa78c162b
 > --- /dev/null
 > +++ b/configs/raspberrypi3_64_defconfig
 > @@ -0,0 +1,39 @@
 > +BR2_aarch64=y
 > +BR2_cortex_a53=y
 > +BR2_ARM_FPU_VFPV4=y
 > +
 > +BR2_GCC_VERSION_6_X=y
 > +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y

Any specific reason why you want to use gcc 6.x / glibc? We normally
don't do that in our defconfigs, and gcc 5 / uClibc works here with a
quick test - So I've removed it.

 > +# Filesystem / image
 > +BR2_TARGET_ROOTFS_EXT2=y
 > +BR2_TARGET_ROOTFS_EXT2_4=y
 > +BR2_TARGET_ROOTFS_EXT2_BLOCKS=120000

I was going to drop this EXT2_BLOCKS, but I did a test build and the
kernel config indeed enables so many modules that they don't fit in our
default size, so I've added a comment about that and committed, thanks.

Patch hide | download patch | download mbox

diff --git a/board/raspberrypi/genimage-raspberrypi3-64.cfg b/board/raspberrypi/genimage-raspberrypi3-64.cfg
new file mode 100644
index 000000000..c5f86527d
--- /dev/null
+++ b/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -0,0 +1,31 @@ 
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2710-rpi-3-b.dtb",
+      "bcm2837-rpi-3-b.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh
index b2bb07067..de972998b 100755
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -16,6 +16,26 @@  dtoverlay=pi3-miniuart-bt
 __EOF__
 	fi
 	;;
+	--aarch64)
+	# Run a 64bits kernel (armv8)
+	sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
+	if ! grep -qE '^arm_control=0x200' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+
+# enable 64bits support
+arm_control=0x200
+__EOF__
+	fi
+
+	# Enable uart console
+	if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+
+# enable rpi3 ttyS0 serial console
+enable_uart=1
+__EOF__
+	fi
+	;;
 esac
 
 rm -rf "${GENIMAGE_TMP}"
diff --git a/board/raspberrypi3-64 b/board/raspberrypi3-64
new file mode 120000
index 000000000..fcdafc81e
--- /dev/null
+++ b/board/raspberrypi3-64
@@ -0,0 +1 @@ 
+raspberrypi
\ No newline at end of file
diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig
new file mode 100644
index 000000000..aa78c162b
--- /dev/null
+++ b/configs/raspberrypi3_64_defconfig
@@ -0,0 +1,39 @@ 
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+BR2_GCC_VERSION_6_X=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_SYSTEM_DHCP="eth0"
+
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5e4ee836560d4c0371e109bf469e1ad808ae7a44"
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
+
+# Build the DTB from the kernel sources
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b"
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=120000
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64"