[meta-raspberrypi][PATCH v2 1/1] raspberrypi0-wifi.conf: Use a stand alone machine configuration

[meta-raspberrypi][PATCH v2 1/1] raspberrypi0-wifi.conf: Use a stand alone machine configuration

[Andrei Gherzan]

As well make all the variables assigned in a way that they can be
overwritten so we can give maximum flexibility to distros.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 conf/machine/raspberrypi0-wifi.conf | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf
index 2b7cea4..adb2238 100644
--- a/conf/machine/raspberrypi0-wifi.conf
+++ b/conf/machine/raspberrypi0-wifi.conf
@@ -2,10 +2,14 @@
 #@NAME: RaspberryPi Zero WiFi Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi Zero  WiFi board (https://www.raspberrypi.org/blog/raspberry-pi-zero-w-joins-family/)
 
-MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
-include conf/machine/raspberrypi.conf
+DEFAULTTUNE ?= "arm1176jzfshf"
+require conf/machine/include/tune-arm1176jzf-s.inc
+include conf/machine/include/rpi-base.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SDIMG_KERNELIMAGE ?= "kernel.img"
+KERNEL_DEFCONFIG ?= "bcmrpi_defconfig"
+UBOOT_MACHINE ?= "rpi_config"
+SERIAL_CONSOLE ?= "115200 ttyS0"
 VC4_CMA_SIZE ?= "cma-128"
-- 
2.12.2

Re: [meta-raspberrypi][PATCH v2 1/1] raspberrypi0-wifi.conf: Use a stand alone machine configuration

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]

On Wed, Apr 19, 2017 at 06:41:03PM +0100, Andrei Gherzan wrote:
> As well make all the variables assigned in a way that they can be
> overwritten so we can give maximum flexibility to distros.
>
> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> ---
>  conf/machine/raspberrypi0-wifi.conf | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf
> index 2b7cea4..adb2238 100644
> --- a/conf/machine/raspberrypi0-wifi.conf
> +++ b/conf/machine/raspberrypi0-wifi.conf
> @@ -2,10 +2,14 @@
>  #@NAME: RaspberryPi Zero WiFi Development Board
>  #@DESCRIPTION: Machine configuration for the RaspberryPi Zero  WiFi board (https://www.raspberrypi.org/blog/raspberry-pi-zero-w-joins-family/)
>
> -MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
> -include conf/machine/raspberrypi.conf
> +DEFAULTTUNE ?= "arm1176jzfshf"
> +require conf/machine/include/tune-arm1176jzf-s.inc
> +include conf/machine/include/rpi-base.inc
>
>  MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
>
> -SERIAL_CONSOLE = "115200 ttyS0"
> +SDIMG_KERNELIMAGE ?= "kernel.img"
> +KERNEL_DEFCONFIG ?= "bcmrpi_defconfig"
> +UBOOT_MACHINE ?= "rpi_config"
> +SERIAL_CONSOLE ?= "115200 ttyS0"
>  VC4_CMA_SIZE ?= "cma-128"
> --
> 2.12.2
>

Merged both in master and morty branches.

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]