[meta-raspberrypi][PATCH 1/5] raspberrypi-cm.conf: Add dummy machine for CM1 (alias for RPi1)

[meta-raspberrypi][PATCH 1/5] raspberrypi-cm.conf: Add dummy machine for CM1 (alias for RPi1)

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/raspberrypi-cm.conf | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 conf/machine/raspberrypi-cm.conf

diff --git a/conf/machine/raspberrypi-cm.conf b/conf/machine/raspberrypi-cm.conf
new file mode 100644
index 0000000..2da7d50
--- /dev/null
+++ b/conf/machine/raspberrypi-cm.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: RaspberryPi Compute Module (CM1)
+#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1)
+
+MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
+include conf/machine/raspberrypi.conf
-- 
2.7.4

[meta-raspberrypi][PATCH 2/5] raspberrypi-cm3.conf: Add dummy machine for CM3 (alias for RPi2)

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/raspberrypi-cm3.conf | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 conf/machine/raspberrypi-cm3.conf

diff --git a/conf/machine/raspberrypi-cm3.conf b/conf/machine/raspberrypi-cm3.conf
new file mode 100644
index 0000000..153d5d5
--- /dev/null
+++ b/conf/machine/raspberrypi-cm3.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: RaspberryPi Compute Module 3 (CM3)
+#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3)
+
+MACHINEOVERRIDES = "raspberrypi2:${MACHINE}"
+include conf/machine/raspberrypi2.conf
-- 
2.7.4

[meta-raspberrypi][PATCH 3/5] raspberrypi*.conf: Minor tweaks

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/raspberrypi.conf  | 1 -
 conf/machine/raspberrypi0.conf | 1 -
 conf/machine/raspberrypi2.conf | 1 -
 conf/machine/raspberrypi3.conf | 4 +---
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index df8194c..ad3b061 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -11,4 +11,3 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 
 UBOOT_MACHINE = "rpi_config"
 VC4_CMA_SIZE_raspberrypi ?= "cma-64"
-
diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf
index 0df9121..7c2b811 100644
--- a/conf/machine/raspberrypi0.conf
+++ b/conf/machine/raspberrypi0.conf
@@ -7,4 +7,3 @@ include conf/machine/raspberrypi.conf
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 VC4_CMA_SIZE ?= "cma-128"
-
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 3f13dc0..9b4c02a 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -11,4 +11,3 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 
 UBOOT_MACHINE = "rpi_2_config"
 VC4_CMA_SIZE ?= "cma-256"
-
diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf
index 9820209..1ac5928 100644
--- a/conf/machine/raspberrypi3.conf
+++ b/conf/machine/raspberrypi3.conf
@@ -3,11 +3,9 @@
 #@DESCRIPTION: Machine configuration for the RaspberryPi 3
 
 MACHINEOVERRIDES = "raspberrypi2:${MACHINE}"
+include conf/machine/raspberrypi2.conf
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
 
-include conf/machine/raspberrypi2.conf
-
 SERIAL_CONSOLE = "115200 ttyS0"
 VC4_CMA_SIZE ?= "cma-256"
-
-- 
2.7.4

[meta-raspberrypi][PATCH 4/5] rpi-base.inc: Include dtb file for CM1 and CM3

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/include/rpi-base.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index 9f20663..e069e70 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -13,12 +13,13 @@ XSERVER = " \
     ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \
     "
 
-# Really supported starting from linux-raspberrypi 3.18.y only
 KERNEL_DEVICETREE ?= " \
     bcm2708-rpi-b.dtb \
     bcm2708-rpi-b-plus.dtb \
     bcm2709-rpi-2-b.dtb \
     bcm2710-rpi-3-b.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
     \
     overlays/hifiberry-amp.dtbo \
     overlays/hifiberry-dac.dtbo \
-- 
2.7.4

[meta-raspberrypi][PATCH 5/5] README: Mention CM1 and CM3 support

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README b/README
index a784890..65a1e5f 100644
--- a/README
+++ b/README
@@ -79,6 +79,8 @@ c. Set MACHINE in local.conf to one of the supported boards:
     - raspberrypi0
     - raspberrypi2
     - raspberrypi3
+    - raspberrypi-cm (dummy alias for raspberrypi)
+    - raspberrypi-cm3 (dummy alias for raspberrypi2)
 d. bitbake rpi-hwup-image
 e. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used)
 f. Boot your RPI.
-- 
2.7.4

Re: [meta-raspberrypi][PATCH 1/5] raspberrypi-cm.conf: Add dummy machine for CM1 (alias for RPi1)

[Andrei Gherzan]

On Fri, Jan 20, 2017 at 7:16 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> ---
>  conf/machine/raspberrypi-cm.conf | 6 ++++++
>  1 file changed, 6 insertions(+)
>  create mode 100644 conf/machine/raspberrypi-cm.conf
>
> diff --git a/conf/machine/raspberrypi-cm.conf b/conf/machine/raspberrypi-cm.conf
> new file mode 100644
> index 0000000..2da7d50
> --- /dev/null
> +++ b/conf/machine/raspberrypi-cm.conf
> @@ -0,0 +1,6 @@
> +#@TYPE: Machine
> +#@NAME: RaspberryPi Compute Module (CM1)
> +#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1)
> +
> +MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
> +include conf/machine/raspberrypi.conf
> --
> 2.7.4
>

Merged the entire patch set in master.

--
Andrei Gherzan