Skip to contentSkip to conversation

raspberrypi0-wifi.conf: Use a stand alone machine configuration

PATCH In review Andrei Gherzan 1 participant 2 messages Apr 19, 2017 – Apr 20, 2017 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

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

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

---
 conf/machine/raspberrypi0-wifi.conf | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
conf/machine/raspberrypi0-wifi.conf +7 -3
index 2b7cea4..adb2238 100644
@@ -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"
Signature · 1 line
2.12.2
#1 lore raw
Quoted 31 lines · 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.

---
 conf/machine/raspberrypi0-wifi.conf | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
conf/machine/raspberrypi0-wifi.conf +7 -4
index 2b7cea4..adb2238 100644
@@ -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"
--
Quoted 2 lines

2.12.2

Merged both in master and morty branches.

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