diff options
| -rw-r--r-- | conf/machine/raspberrypi.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi0.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi2.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi3.conf | 4 |
4 files changed, 1 insertions, 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" | |||
| 11 | 11 | ||
| 12 | UBOOT_MACHINE = "rpi_config" | 12 | UBOOT_MACHINE = "rpi_config" |
| 13 | VC4_CMA_SIZE_raspberrypi ?= "cma-64" | 13 | VC4_CMA_SIZE_raspberrypi ?= "cma-64" |
| 14 | |||
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 | |||
| 7 | 7 | ||
| 8 | SERIAL_CONSOLE = "115200 ttyAMA0" | 8 | SERIAL_CONSOLE = "115200 ttyAMA0" |
| 9 | VC4_CMA_SIZE ?= "cma-128" | 9 | VC4_CMA_SIZE ?= "cma-128" |
| 10 | |||
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" | |||
| 11 | 11 | ||
| 12 | UBOOT_MACHINE = "rpi_2_config" | 12 | UBOOT_MACHINE = "rpi_2_config" |
| 13 | VC4_CMA_SIZE ?= "cma-256" | 13 | VC4_CMA_SIZE ?= "cma-256" |
| 14 | |||
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 @@ | |||
| 3 | #@DESCRIPTION: Machine configuration for the RaspberryPi 3 | 3 | #@DESCRIPTION: Machine configuration for the RaspberryPi 3 |
| 4 | 4 | ||
| 5 | MACHINEOVERRIDES = "raspberrypi2:${MACHINE}" | 5 | MACHINEOVERRIDES = "raspberrypi2:${MACHINE}" |
| 6 | include conf/machine/raspberrypi2.conf | ||
| 6 | 7 | ||
| 7 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" | 8 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" |
| 8 | 9 | ||
| 9 | include conf/machine/raspberrypi2.conf | ||
| 10 | |||
| 11 | SERIAL_CONSOLE = "115200 ttyS0" | 10 | SERIAL_CONSOLE = "115200 ttyS0" |
| 12 | VC4_CMA_SIZE ?= "cma-256" | 11 | VC4_CMA_SIZE ?= "cma-256" |
| 13 | |||
