mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
machines: simplify MACHINEOVERRIDES definitions
Prepending new definitions should be preferred to assignment, as it is simpler and more conducive to defining new machine configurations that reuse these configurations. Signed-off-by: Zachary T Welch <zach@aquabyte.ai>
This commit is contained in:
parent
cfd3eb4ec5
commit
9c81413d0b
|
@ -2,7 +2,7 @@
|
||||||
#@NAME: RaspberryPi Compute Module (CM1)
|
#@NAME: RaspberryPi Compute Module (CM1)
|
||||||
#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1)
|
#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1)
|
||||||
|
|
||||||
MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
|
MACHINEOVERRIDES =. "raspberrypi:"
|
||||||
include conf/machine/raspberrypi.conf
|
include conf/machine/raspberrypi.conf
|
||||||
|
|
||||||
ARMSTUB ?= "armstub.bin"
|
ARMSTUB ?= "armstub.bin"
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
#@NAME: RaspberryPi0 2 Wifi Development Board
|
#@NAME: RaspberryPi0 2 Wifi Development Board
|
||||||
#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 64 bits mode
|
#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 64 bits mode
|
||||||
|
|
||||||
include conf/machine/raspberrypi3-64.conf
|
MACHINEOVERRIDES =. "raspberrypi3-64:"
|
||||||
|
|
||||||
MACHINEOVERRIDES := "${@'${MACHINEOVERRIDES}'.replace(':${MACHINE}',':raspberrypi3-64:${MACHINE}')}"
|
include conf/machine/raspberrypi3-64.conf
|
||||||
|
|
||||||
MACHINE_EXTRA_RRECOMMENDS += "\
|
MACHINE_EXTRA_RRECOMMENDS += "\
|
||||||
linux-firmware-rpidistro-bcm43436 \
|
linux-firmware-rpidistro-bcm43436 \
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
#@NAME: RaspberryPi0 2 Wifi Development Board
|
#@NAME: RaspberryPi0 2 Wifi Development Board
|
||||||
#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 32 bits mode
|
#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 32 bits mode
|
||||||
|
|
||||||
include conf/machine/raspberrypi3.conf
|
MACHINEOVERRIDES =. "raspberrypi3:"
|
||||||
|
|
||||||
MACHINEOVERRIDES := "${@'${MACHINEOVERRIDES}'.replace(':${MACHINE}',':raspberrypi3:${MACHINE}')}"
|
include conf/machine/raspberrypi3.conf
|
||||||
|
|
||||||
MACHINE_EXTRA_RRECOMMENDS += "\
|
MACHINE_EXTRA_RRECOMMENDS += "\
|
||||||
linux-firmware-rpidistro-bcm43436 \
|
linux-firmware-rpidistro-bcm43436 \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#@NAME: RaspberryPi Zero Development Board
|
#@NAME: RaspberryPi Zero Development Board
|
||||||
#@DESCRIPTION: Machine configuration for the RaspberryPi Zero board (https://www.raspberrypi.org/blog/raspberry-pi-zero)
|
#@DESCRIPTION: Machine configuration for the RaspberryPi Zero board (https://www.raspberrypi.org/blog/raspberry-pi-zero)
|
||||||
|
|
||||||
MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
|
MACHINEOVERRIDES =. "raspberrypi:"
|
||||||
include conf/machine/raspberrypi.conf
|
include conf/machine/raspberrypi.conf
|
||||||
|
|
||||||
SERIAL_CONSOLES ?= "115200;ttyAMA0"
|
SERIAL_CONSOLES ?= "115200;ttyAMA0"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#@NAME: RaspberryPi 3 Development Board
|
#@NAME: RaspberryPi 3 Development Board
|
||||||
#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode
|
#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode
|
||||||
|
|
||||||
MACHINEOVERRIDES = "raspberrypi3:${MACHINE}"
|
MACHINEOVERRIDES =. "raspberrypi3:"
|
||||||
|
|
||||||
MACHINE_EXTRA_RRECOMMENDS += "\
|
MACHINE_EXTRA_RRECOMMENDS += "\
|
||||||
linux-firmware-rpidistro-bcm43430 \
|
linux-firmware-rpidistro-bcm43430 \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#@NAME: RaspberryPi 4 Development Board (64bit)
|
#@NAME: RaspberryPi 4 Development Board (64bit)
|
||||||
#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode
|
#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode
|
||||||
|
|
||||||
MACHINEOVERRIDES = "raspberrypi4:${MACHINE}"
|
MACHINEOVERRIDES =. "raspberrypi4:"
|
||||||
|
|
||||||
MACHINE_FEATURES += "pci"
|
MACHINE_FEATURES += "pci"
|
||||||
MACHINE_EXTRA_RRECOMMENDS += "\
|
MACHINE_EXTRA_RRECOMMENDS += "\
|
||||||
|
|
Loading…
Reference in New Issue
Block a user