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

Andrei Gherzan andrei at gherzan.ro
Fri Jan 20 11:16:03 PST 2017


Signed-off-by: Andrei Gherzan <andrei at 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




More information about the yocto mailing list