[v2] board: added support for Raspberry Pi Zero W

Message ID 1498077584-19344-1-git-send-email-yves.deweerdt.linux@gmail.com
State New
Headers show

Commit Message

Yves Deweerdt June 21, 2017, 8:39 p.m.
added a new config file for the Raspberry Pi Zero W (rpi0w)
- added new folder for raspberrypi0w
- included the overlays in the genimage config
- add pi3-miniuart-bt overlay to the config
- remove rpi0w device tree from the raspberrypi0_defconfig and genimage

Signed-off-by: Yves Deweerdt <yves.deweerdt.linux@gmail.com>
---
 board/raspberrypi/genimage-raspberrypi0.cfg  |  1 -
 board/raspberrypi/genimage-raspberrypi0w.cfg | 31 +++++++++++++++++++++++++
 board/raspberrypi0w                          |  1 +
 configs/raspberrypi0_defconfig               |  2 +-
 configs/raspberrypi0w_defconfig              | 34 ++++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 board/raspberrypi/genimage-raspberrypi0w.cfg
 create mode 120000 board/raspberrypi0w
 create mode 100644 configs/raspberrypi0w_defconfig

Comments

Thomas Petazzoni June 21, 2017, 8:46 p.m. | #1
Hello,

On Wed, 21 Jun 2017 22:39:44 +0200, Yves Deweerdt wrote:
> added a new config file for the Raspberry Pi Zero W (rpi0w)
> - added new folder for raspberrypi0w
> - included the overlays in the genimage config
> - add pi3-miniuart-bt overlay to the config
> - remove rpi0w device tree from the raspberrypi0_defconfig and genimage
> 
> Signed-off-by: Yves Deweerdt <yves.deweerdt.linux@gmail.com>

I'd like a review/ack from Peter Seiderer, or other RPi folks of the
Buildroot community. I think the commit log should summarize why the
Zero W support is removed from raspberrypi0_defconfig, and why a
separate defconfig is needed.

> ---
>  board/raspberrypi/genimage-raspberrypi0.cfg  |  1 -
>  board/raspberrypi/genimage-raspberrypi0w.cfg | 31 +++++++++++++++++++++++++
>  board/raspberrypi0w                          |  1 +
>  configs/raspberrypi0_defconfig               |  2 +-
>  configs/raspberrypi0w_defconfig              | 34 ++++++++++++++++++++++++++++
>  5 files changed, 67 insertions(+), 2 deletions(-)
>  create mode 100644 board/raspberrypi/genimage-raspberrypi0w.cfg
>  create mode 120000 board/raspberrypi0w
>  create mode 100644 configs/raspberrypi0w_defconfig

An update to board/raspberrypi/readme.txt would be needed.

Thanks,

Thomas
Arnout Vandecappelle June 21, 2017, 9:09 p.m. | #2
On 21-06-17 22:46, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 21 Jun 2017 22:39:44 +0200, Yves Deweerdt wrote:
>> added a new config file for the Raspberry Pi Zero W (rpi0w)
>> - added new folder for raspberrypi0w
>> - included the overlays in the genimage config
>> - add pi3-miniuart-bt overlay to the config
>> - remove rpi0w device tree from the raspberrypi0_defconfig and genimage
>>
>> Signed-off-by: Yves Deweerdt <yves.deweerdt.linux@gmail.com>
> 
> I'd like a review/ack from Peter Seiderer, or other RPi folks of the
> Buildroot community. I think the commit log should summarize why the
> Zero W support is removed from raspberrypi0_defconfig, and why a
> separate defconfig is needed.

 I also feel uncomfortable with splitting the defconfig for the two. Perhaps the
version you submitted here can also be used for Rpi0?

>> ---
>>  board/raspberrypi/genimage-raspberrypi0.cfg  |  1 -
>>  board/raspberrypi/genimage-raspberrypi0w.cfg | 31 +++++++++++++++++++++++++
>>  board/raspberrypi0w                          |  1 +
>>  configs/raspberrypi0_defconfig               |  2 +-
>>  configs/raspberrypi0w_defconfig              | 34 ++++++++++++++++++++++++++++

 To highlight the differences with the existing files, you can use 'git
format-patch -C' (and possibly also --find-copies-harder). Then the differences
with the existing files stand out.

 Regards,
 Arnout

>>  5 files changed, 67 insertions(+), 2 deletions(-)
>>  create mode 100644 board/raspberrypi/genimage-raspberrypi0w.cfg
>>  create mode 120000 board/raspberrypi0w
>>  create mode 100644 configs/raspberrypi0w_defconfig
> 
> An update to board/raspberrypi/readme.txt would be needed.
> 
> Thanks,
> 
> Thomas
>
Peter Seiderer June 22, 2017, 8:29 p.m. | #3
Hello Thomas, Yves,

On Wed, 21 Jun 2017 22:46:48 +0200, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Hello,
> 
> On Wed, 21 Jun 2017 22:39:44 +0200, Yves Deweerdt wrote:
> > added a new config file for the Raspberry Pi Zero W (rpi0w)
> > - added new folder for raspberrypi0w
> > - included the overlays in the genimage config
> > - add pi3-miniuart-bt overlay to the config
> > - remove rpi0w device tree from the raspberrypi0_defconfig and genimage
> > 
> > Signed-off-by: Yves Deweerdt <yves.deweerdt.linux@gmail.com>
> 
> I'd like a review/ack from Peter Seiderer, or other RPi folks of the
> Buildroot community. I think the commit log should summarize why the
> Zero W support is removed from raspberrypi0_defconfig, and why a
> separate defconfig is needed.
> 

The remaining difference between raspberrypi0_defconfig raspberrypi0w_defconfig
wil be the usage of the pi3-miniuart-bt overlay. As there is no possibility to
enable/disable this on demand I think this is enough to justify a second
configuration (and keep the 'better' ttyAMA0 usage for serial console for
the basic raspberrypi0)...

Regards,
Peter

> > ---
> >  board/raspberrypi/genimage-raspberrypi0.cfg  |  1 -
> >  board/raspberrypi/genimage-raspberrypi0w.cfg | 31 +++++++++++++++++++++++++
> >  board/raspberrypi0w                          |  1 +
> >  configs/raspberrypi0_defconfig               |  2 +-
> >  configs/raspberrypi0w_defconfig              | 34 ++++++++++++++++++++++++++++
> >  5 files changed, 67 insertions(+), 2 deletions(-)
> >  create mode 100644 board/raspberrypi/genimage-raspberrypi0w.cfg
> >  create mode 120000 board/raspberrypi0w
> >  create mode 100644 configs/raspberrypi0w_defconfig
> 
> An update to board/raspberrypi/readme.txt would be needed.
> 
> Thanks,
> 
> Thomas

Patch

diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg
index 212c306..a9d4c45 100644
--- a/board/raspberrypi/genimage-raspberrypi0.cfg
+++ b/board/raspberrypi/genimage-raspberrypi0.cfg
@@ -2,7 +2,6 @@  image boot.vfat {
   vfat {
     files = {
       "bcm2708-rpi-b-plus.dtb",
-      "bcm2708-rpi-0-w.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
diff --git a/board/raspberrypi/genimage-raspberrypi0w.cfg b/board/raspberrypi/genimage-raspberrypi0w.cfg
new file mode 100644
index 0000000..3aafd9b
--- /dev/null
+++ b/board/raspberrypi/genimage-raspberrypi0w.cfg
@@ -0,0 +1,31 @@ 
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2708-rpi-0-w.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "rpi-firmware/overlays",
+      "zImage"
+    }
+  }
+  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/raspberrypi0w b/board/raspberrypi0w
new file mode 120000
index 0000000..fcdafc8
--- /dev/null
+++ b/board/raspberrypi0w
@@ -0,0 +1 @@ 
+raspberrypi
\ No newline at end of file
diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig
index 10947b8..457999e 100644
--- a/configs/raspberrypi0_defconfig
+++ b/configs/raspberrypi0_defconfig
@@ -16,7 +16,7 @@  BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 # Build the DTBs for A/B from the kernel sources: the zero is the same
 # as the A+ model, just in a different form-factor
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus bcm2708-rpi-0-w"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus"
 
 BR2_PACKAGE_RPI_FIRMWARE=y
 # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig
new file mode 100644
index 0000000..cecda3d
--- /dev/null
+++ b/configs/raspberrypi0w_defconfig
@@ -0,0 +1,34 @@ 
+BR2_arm=y
+BR2_arm1176jzf_s=y
+BR2_ARM_EABIHF=y
+
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+BR2_TOOLCHAIN_BUILDROOT_CXX=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="bcmrpi"
+
+# build device tree speicifically required for rpi0w
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
+
+# 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_TAR is not set
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"