Add support for Raspberry Pi 4.

brocaar · brocaar · commit 7b71722f6773 · 2020-04-02T13:18:12.000+02:00
Closes #17 and #45.
diff --git a/README.md b/README.md
@@ -40,6 +40,7 @@ Provides the following features:
 
 * Raspberry Pi 1
 * Raspberry Pi 3
+* Raspberry Pi 4
 
 #### Shields / kits
 
diff --git a/docs/config.toml b/docs/config.toml
@@ -36,6 +36,7 @@ theme = "chirpstack-hugo-theme"
 [params]
     raspberrypi_raspberrypi_version = "3.3.0-test.5"
     raspberrypi_raspberrypi3_version = "3.3.0-test.5"
+    raspberrypi_raspberrypi4_version = "3.3.0-test.5"
     wifx_lorix_one_sd_version = "3.2.0test1"
     wifx_lorix_one_512_sd_version = "3.2.0test1"
 	component = "chirpstack-gateway-os"
diff --git a/docs/content/install/raspberrypi.md b/docs/content/install/raspberrypi.md
@@ -26,6 +26,7 @@ For an initial installation:
 
 * [Raspberry Pi 1](http://artifacts.chirpstack.io/downloads/chirpstack-gateway-os/raspberrypi/raspberrypi/{{< raspberrypi_raspberrypi_version >}}/)
 * [Raspberry Pi 3](http://artifacts.chirpstack.io/downloads/chirpstack-gateway-os/raspberrypi/raspberrypi3/{{< raspberrypi_raspberrypi3_version >}}/)
+* [Raspberry Pi 4](http://artifacts.chirpstack.io/downloads/chirpstack-gateway-os/raspberrypi/raspberrypi4/{{< raspberrypi_raspberrypi4_version >}}/)
 
 ## Supported shields
 
diff --git a/docs/content/overview/_index.md b/docs/content/overview/_index.md
@@ -35,6 +35,7 @@ by the **chirpstack-gateway-os-base** image.
 
 * Raspberry Pi 1
 * Raspberry Pi 3
+* Raspberry Pi 4
 
 #### Shields / kits
 
diff --git a/layers/chirpstack/meta-tools/recipes-monitoring/monit/monit_5.26.0.bb b/layers/chirpstack/meta-tools/recipes-monitoring/monit/monit_5.26.0.bb
@@ -46,9 +46,6 @@ do_install_append() {
 
 	install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
 	install -m 700 -d ${D}${sysconfdir}/monit.d/
-	sed -i -e 's:# set daemon  120:set daemon  120:' \
-	       -e 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' \
-	       ${D}${sysconfdir}/monitrc
 }
 
 CONFFILES_${PN} += "${sysconfdir}/monitrc"
diff --git a/layers/targets/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_%.bbappend b/layers/targets/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_%.bbappend
@@ -9,3 +9,7 @@ do_deploy_append_raspberrypi3() {
     echo "core_freq=250" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     echo "dtoverlay=pi3-disable-bt" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
 }
+
+do_deploy_append_raspberrypi4() {
+    echo "dtoverlay=disable-bt" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+}
diff --git a/layers/targets/meta-raspberrypi/recipes-bsp/u-boot/patches/pi3-device-tree.patch b/layers/targets/meta-raspberrypi/recipes-bsp/u-boot/patches/pi3-device-tree.patch
@@ -29,31 +29,3 @@ index ce71f578..8d88e782 100644
  /* SDHCI is used to control the SDIO for wireless */
  &sdhci {
  	#address-cells = <1>;
-diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
-index 617c892d..2c24b05c 100644
---- a/board/raspberrypi/rpi/rpi.c
-+++ b/board/raspberrypi/rpi/rpi.c
-@@ -496,3 +496,9 @@ int ft_board_setup(void *blob, bd_t *bd)
- 
- 	return 0;
- }
-+
-+int board_early_init_f(void)
-+{
-+	gd->flags |= (GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE);
-+	return 0;
-+}
-diff --git a/include/configs/rpi.h b/include/configs/rpi.h
-index f76c7d18..7d0d3562 100644
---- a/include/configs/rpi.h
-+++ b/include/configs/rpi.h
-@@ -187,4 +187,9 @@
- 	BOOTENV
- 
- 
-+#define CONFIG_DISABLE_CONSOLE
-+#define CONFIG_SILENT_CONSOLE
-+#define CONFIG_SYS_DEVICE_NULLDEV
-+#define CONFIG_BOARD_EARLY_INIT_F 1
-+
- #endif
diff --git a/layers/targets/meta-raspberrypi/recipes-bsp/u-boot/patches/rpi.patch b/layers/targets/meta-raspberrypi/recipes-bsp/u-boot/patches/rpi.patch
@@ -0,0 +1,28 @@
+diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
+index 617c892d..2c24b05c 100644
+--- a/board/raspberrypi/rpi/rpi.c
++++ b/board/raspberrypi/rpi/rpi.c
+@@ -496,3 +496,9 @@ int ft_board_setup(void *blob, bd_t *bd)
+ 
+ 	return 0;
+ }
++
++int board_early_init_f(void)
++{
++	gd->flags |= (GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE);
++	return 0;
++}
+diff --git a/include/configs/rpi.h b/include/configs/rpi.h
+index f76c7d18..7d0d3562 100644
+--- a/include/configs/rpi.h
++++ b/include/configs/rpi.h
+@@ -187,4 +187,9 @@
+ 	BOOTENV
+ 
+ 
++#define CONFIG_DISABLE_CONSOLE
++#define CONFIG_SILENT_CONSOLE
++#define CONFIG_SYS_DEVICE_NULLDEV
++#define CONFIG_BOARD_EARLY_INIT_F 1
++
+ #endif
diff --git a/layers/targets/meta-raspberrypi/recipes-bsp/u-boot/u-boot-raspberrypi.inc b/layers/targets/meta-raspberrypi/recipes-bsp/u-boot/u-boot-raspberrypi.inc
@@ -2,7 +2,6 @@ FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/patches:"
 
 SRC_URI_append_rpi = " \
     file://bootcount.patch \
-    file://disable-console-to-fix-gps.patch \
+    file://rpi.patch \
+    file://pi3-device-tree.patch \
 "
-
-
diff --git a/layers/targets/meta-raspberrypi/recipes-core/base-files/base-files_%.bbappend b/layers/targets/meta-raspberrypi/recipes-core/base-files/base-files_%.bbappend
@@ -18,3 +18,10 @@ do_install_append_raspberrypi3() {
     install -m 644 ${WORKDIR}/connman/main.conf ${D}/etc/connman/main.conf
     install -m 644 ${WORKDIR}/connman/settings ${D}/var/lib/connman/settings
 }
+
+do_install_append_raspberrypi4() {
+    install -d ${D}/etc/connman
+    install -d ${D}/var/lib/connman
+    install -m 644 ${WORKDIR}/connman/main.conf ${D}/etc/connman/main.conf
+    install -m 644 ${WORKDIR}/connman/settings ${D}/var/lib/connman/settings
+}
diff --git a/layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/files/raspberrypi4/sw-description b/layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/files/raspberrypi4/sw-description
@@ -0,0 +1,59 @@
+software =
+{
+	version = "@@DISTRO_VERSION@@";
+
+	raspberrypi4 = {
+		hardware-compatibility: [ "1.0"];
+		stable : {
+			copy1 : {
+				images: (
+					{
+						filename = "chirpstack-gateway-os-base-raspberrypi4.ext4.gz";
+						type = "raw";
+						compressed = true;
+						device = "/dev/mmcblk0p2";
+					}
+				);
+				uboot: (
+					{
+						name = "part_active";
+						value = "2";
+					},
+					{
+						name = "part_backup";
+						value = "3";
+					},
+					{
+						name = "upgrade_available";
+						value = "1";
+					}
+				);
+
+			};
+			copy2 : {
+				images: (
+					{
+						filename = "chirpstack-gateway-os-base-raspberrypi4.ext4.gz";
+						type = "raw";
+						compressed = true;
+						device = "/dev/mmcblk0p3";
+					}
+				);
+				uboot: (
+					{
+						name = "part_active";
+						value = "3";
+					},
+					{
+						name = "part_backup";
+						value = "2";
+					},
+					{
+						name = "upgrade_available";
+						value = "1";
+					}
+				);
+			};
+		};
+	}
+}
diff --git a/layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/files/raspberrypi4/sw-description b/layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/files/raspberrypi4/sw-description
@@ -0,0 +1,59 @@
+software =
+{
+	version = "@@DISTRO_VERSION@@";
+
+	raspberrypi4 = {
+		hardware-compatibility: [ "1.0"];
+		stable : {
+			copy1 : {
+				images: (
+					{
+						filename = "chirpstack-gateway-os-full-raspberrypi4.ext4.gz";
+						type = "raw";
+						compressed = true;
+						device = "/dev/mmcblk0p2";
+					}
+				);
+				uboot: (
+					{
+						name = "part_active";
+						value = "2";
+					},
+					{
+						name = "part_backup";
+						value = "3";
+					},
+					{
+						name = "upgrade_available";
+						value = "1";
+					}
+				);
+
+			};
+			copy2 : {
+				images: (
+					{
+						filename = "chirpstack-gateway-os-full-raspberrypi4.ext4.gz";
+						type = "raw";
+						compressed = true;
+						device = "/dev/mmcblk0p3";
+					}
+				);
+				uboot: (
+					{
+						name = "part_active";
+						value = "3";
+					},
+					{
+						name = "part_backup";
+						value = "2";
+					},
+					{
+						name = "upgrade_available";
+						value = "1";
+					}
+				);
+			};
+		};
+	}
+}
diff --git a/layers/targets/meta-raspberrypi/recipes-swupdate/software-update/files/raspberrypi4/software-update.sh b/layers/targets/meta-raspberrypi/recipes-swupdate/software-update/files/raspberrypi4/software-update.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+part_active=`fw_printenv part_active |cut -d '=' -f 2`
+
+if [ -z "$part_active" ] || [ "$part_active" = 2 ]; then
+        selection="stable,copy2"
+else
+        selection="stable,copy1"
+fi
+
+swupdate -H raspberrypi4:1.0 -e ${selection} -i $1
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
@@ -8,6 +8,7 @@ DISTRO = "chirpstack-gateway-os"
 # Vendor: raspberrypi
 #         * raspberrypi
 #         * raspberrypi3
+#         * raspberrypi4
 MACHINE = "raspberrypi3"
 
 # Parallel executed tasks
diff --git a/meta/recipes-core/images/chirpstack-gateway-os-base.bb b/meta/recipes-core/images/chirpstack-gateway-os-base.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "Image including the LoRa packet-forwarder and ChirpStack Gateway
 
 require recipes-core/images/core-image-minimal.bb
 
+# rng-tools is used to speed up /dev/random. This is used by Monit to generate a
+# random id. Without it, it can in some cases (Pi 4) take minutes to start up!
 IMAGE_INSTALL += " \
     packagegroup-base \
     ca-certificates \
+    rng-tools \
 	bash \
     sudo \
     iptables \

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,6 @@ do_install_append() {`
`46`	`46`
`47`	`47`	`install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc`
`48`	`48`	`install -m 700 -d ${D}${sysconfdir}/monit.d/`
`49`		`- sed -i -e 's:# set daemon 120:set daemon 120:' \`
`50`		`- -e 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' \`
`51`		`- ${D}${sysconfdir}/monitrc`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`CONFFILES_${PN} += "${sysconfdir}/monitrc"`
Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,7 @@ do_deploy_append_raspberrypi3() {`
`9`	`9`	`echo "core_freq=250" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt`
`10`	`10`	`echo "dtoverlay=pi3-disable-bt" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt`
`11`	`11`	`}`
	`12`	`+`
	`13`	`+do_deploy_append_raspberrypi4() {`
	`14`	`+ echo "dtoverlay=disable-bt" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt`
	`15`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/patches:"`
`2`	`2`
`3`	`3`	`SRC_URI_append_rpi = " \`
`4`	`4`	`file://bootcount.patch \`
`5`		`- file://disable-console-to-fix-gps.patch \`
	`5`	`+ file://rpi.patch \`
	`6`	`+ file://pi3-device-tree.patch \`
`6`	`7`	`"`
`7`		`-`
`8`		`-`