diff options
| -rw-r--r-- | conf/machine/raspberrypi.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi0-wifi.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi0.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi2.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi3-64.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi3.conf | 1 | ||||
| -rw-r--r-- | recipes-bsp/bootfiles/rpi-config_git.bb | 2 |
7 files changed, 1 insertions, 7 deletions
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index 9a9133c..e94ad86 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf | |||
| @@ -10,4 +10,3 @@ include conf/machine/include/rpi-base.inc | |||
| 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 11 | 11 | ||
| 12 | UBOOT_MACHINE = "rpi_config" | 12 | UBOOT_MACHINE = "rpi_config" |
| 13 | VC4_CMA_SIZE_raspberrypi ?= "cma-64" | ||
diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf index 594538f..7d7f1da 100644 --- a/conf/machine/raspberrypi0-wifi.conf +++ b/conf/machine/raspberrypi0-wifi.conf | |||
| @@ -14,4 +14,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\ | |||
| 14 | SDIMG_KERNELIMAGE ?= "kernel.img" | 14 | SDIMG_KERNELIMAGE ?= "kernel.img" |
| 15 | UBOOT_MACHINE ?= "rpi_0_w_defconfig" | 15 | UBOOT_MACHINE ?= "rpi_0_w_defconfig" |
| 16 | SERIAL_CONSOLES ?= "115200;ttyS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 17 | VC4_CMA_SIZE ?= "cma-128" | ||
diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf index b75fc58..80297b5 100644 --- a/conf/machine/raspberrypi0.conf +++ b/conf/machine/raspberrypi0.conf | |||
| @@ -6,4 +6,3 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}" | |||
| 6 | include conf/machine/raspberrypi.conf | 6 | include conf/machine/raspberrypi.conf |
| 7 | 7 | ||
| 8 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 8 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 9 | VC4_CMA_SIZE ?= "cma-128" | ||
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index a353702..bd191c3 100644 --- a/conf/machine/raspberrypi2.conf +++ b/conf/machine/raspberrypi2.conf | |||
| @@ -10,4 +10,3 @@ include conf/machine/include/rpi-base.inc | |||
| 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 11 | 11 | ||
| 12 | UBOOT_MACHINE = "rpi_2_config" | 12 | UBOOT_MACHINE = "rpi_2_config" |
| 13 | VC4_CMA_SIZE ?= "cma-256" | ||
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index c03f775..456373d 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf | |||
| @@ -21,7 +21,6 @@ RPI_KERNEL_DEVICETREE = " \ | |||
| 21 | " | 21 | " |
| 22 | 22 | ||
| 23 | SERIAL_CONSOLES ?= "115200;ttyS0" | 23 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 24 | VC4_CMA_SIZE ?= "cma-256" | ||
| 25 | 24 | ||
| 26 | UBOOT_MACHINE = "rpi_3_config" | 25 | UBOOT_MACHINE = "rpi_3_config" |
| 27 | MACHINE_FEATURES_append = " vc4graphics" | 26 | MACHINE_FEATURES_append = " vc4graphics" |
diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf index e5df51a..4fcff18 100644 --- a/conf/machine/raspberrypi3.conf +++ b/conf/machine/raspberrypi3.conf | |||
| @@ -16,4 +16,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\ | |||
| 16 | SDIMG_KERNELIMAGE ?= "kernel7.img" | 16 | SDIMG_KERNELIMAGE ?= "kernel7.img" |
| 17 | UBOOT_MACHINE = "rpi_3_32b_config" | 17 | UBOOT_MACHINE = "rpi_3_32b_config" |
| 18 | SERIAL_CONSOLES ?= "115200;ttyS0" | 18 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 19 | VC4_CMA_SIZE ?= "cma-256" | ||
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb index 27a3b85..d92b8e4 100644 --- a/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/recipes-bsp/bootfiles/rpi-config_git.bb | |||
| @@ -158,7 +158,7 @@ do_deploy() { | |||
| 158 | # VC4 Graphics support | 158 | # VC4 Graphics support |
| 159 | if [ "${VC4GRAPHICS}" = "1" ]; then | 159 | if [ "${VC4GRAPHICS}" = "1" ]; then |
| 160 | echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 160 | echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 161 | echo "dtoverlay=${VC4DTBO},${VC4_CMA_SIZE}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 161 | echo "dtoverlay=${VC4DTBO}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 162 | fi | 162 | fi |
| 163 | 163 | ||
| 164 | # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm) | 164 | # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm) |
