diff mbox

configs: add raspberrypi3 64bits defconfig

Message ID 20170415113751.14317-1-gael.portay@savoirfairelinux.com
State Superseded
Headers show

Commit Message

Gaël PORTAY April 15, 2017, 11:37 a.m. UTC
This configuration builds a 64bit image for RaspberryPi 3.

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---

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              | 38 ++++++++++++++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 board/raspberrypi/genimage-raspberrypi3-64.cfg
 create mode 120000 board/raspberrypi3-64
 create mode 100644 configs/raspberrypi3_64_defconfig

Comments

Thomas Petazzoni April 16, 2017, 8:50 a.m. UTC | #1
Hello,

On Sat, 15 Apr 2017 07:37:51 -0400, Gaël PORTAY wrote:
> This configuration builds a 64bit image for RaspberryPi 3.
> 
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
> ---

It looks good to me, but since Arnout had a look at the first version,
I'll wait for his review.

Thanks!

Thomas
Gaël PORTAY April 16, 2017, 3:16 p.m. UTC | #2
Hello,

On Sun, Apr 16, 2017 at 10:50:42AM +0200, Thomas Petazzoni wrote:
> Hello,
> 
> On Sat, 15 Apr 2017 07:37:51 -0400, Gaël PORTAY wrote:
> > This configuration builds a 64bit image for RaspberryPi 3.
> > 
> > Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
> > ---
> 
> It looks good to me, but since Arnout had a look at the first version,
> I'll wait for his review.
> 
> Thanks!
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Thanks.

Regards,
Gaël
Martin Bark April 18, 2017, 10:42 a.m. UTC | #3
Gaël,

Thanks for working on this.  I was about to do this so you saved me a job :)

On 15 April 2017 at 12:37, Gaël PORTAY <gael.portay@savoirfairelinux.com>
wrote:

> This configuration builds a 64bit image for RaspberryPi 3.
>
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
> ---
>
> 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              | 38
> ++++++++++++++++++++++++++
>  4 files changed, 90 insertions(+)
>  create mode 100644 board/raspberrypi/genimage-raspberrypi3-64.cfg
>  create mode 120000 board/raspberrypi3-64
>  create mode 100644 configs/raspberrypi3_64_defconfig
>
> 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..f5839dc49
> --- /dev/null
> +++ b/configs/raspberrypi3_64_defconfig
> @@ -0,0 +1,38 @@
> +BR2_aarch64=y
> +BR2_cortex_a53=y
>

The rpi3 has a VFPv4 floating point unit so i think we also
need BR2_ARM_FPU_VFPV4=y

Thanks

Martin


> +
> +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="5e4ee836560d4c0371e109bf469e1a
> d808ae7a44"
> +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"
> --
> 2.12.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Gaël PORTAY April 18, 2017, 3:50 p.m. UTC | #4
Martin,

On Tue, Apr 18, 2017 at 11:42:58AM +0100, Martin Bark wrote:
> Gaël,
> 
> Thanks for working on this.  I was about to do this so you saved me a job :)
> 
> [snip]
> > +++ b/configs/raspberrypi3_64_defconfig
> > @@ -0,0 +1,38 @@
> > +BR2_aarch64=y
> > +BR2_cortex_a53=y
> >
> 
> The rpi3 has a VFPv4 floating point unit so i think we also
> need BR2_ARM_FPU_VFPV4=y
> 

I am not able to find this information for Broadcom 2837 CPU.

But I trust you and wikipedia [1].

Thanks!

> Thanks
> 
> Martin
> 

Regards,
Gaël

[1] https://en.wikipedia.org/wiki/ARM_Cortex-A53
diff mbox

Patch

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..f5839dc49
--- /dev/null
+++ b/configs/raspberrypi3_64_defconfig
@@ -0,0 +1,38 @@ 
+BR2_aarch64=y
+BR2_cortex_a53=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"