summaryrefslogtreecommitdiff
path: root/meta-raspberrypi/conf/machine
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-16 17:06:00 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-16 17:06:13 +0300
commit1b9ee2930ed85e998a455a6149e2592a83609443 (patch)
treecc13fad7c07cdcd0532fcfd22482a4c00b558512 /meta-raspberrypi/conf/machine
parente42b3e385822fc1b08807a585d4bb2015c823690 (diff)
downloadopenbmc-1b9ee2930ed85e998a455a6149e2592a83609443.tar.xz
meta-raspberrypi: subtree update:a953fc0f9b..e7c856ee7b
Allen Wild (1): conf/machine: add pci to MACHINE_FEATURES for Pi4 Andrei Gherzan (3): pi-bluetooth: Fix signature failures raspberrypi-tools: Update to current HEAD armstubs: Define the new symbols use in Makefile Erik Botö (1): Add support for PiTFT 2.8" with capacitive touch Martin Jansa (1): gstreamer1.0-plugins-base: respect opengl DISTRO_FEATURES when vc4graphics is in MACHINE_FEATURES Pierre-Jean Texier (1): linux-raspberrypi: bump to Linux version 4.19.93 Ricardo Salveti (2): linux-raspberrypi: define kbuild defconfig for rpi cm3 raspberrypi-cm3.conf: drop KBUILD_DEFCONFIG definition Change-Id: Ie923657098eaf9733c7f6f73ee1f888174d44e5f Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-raspberrypi/conf/machine')
-rw-r--r--meta-raspberrypi/conf/machine/include/rpi-base.inc1
-rw-r--r--meta-raspberrypi/conf/machine/raspberrypi-cm3.conf1
-rw-r--r--meta-raspberrypi/conf/machine/raspberrypi4-64.conf1
-rw-r--r--meta-raspberrypi/conf/machine/raspberrypi4.conf1
4 files changed, 3 insertions, 1 deletions
diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc
index 36a8daf1a..9772fd9d6 100644
--- a/meta-raspberrypi/conf/machine/include/rpi-base.inc
+++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc
@@ -30,6 +30,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
overlays/pi3-miniuart-bt.dtbo \
overlays/pitft22.dtbo \
overlays/pitft28-resistive.dtbo \
+ overlays/pitft28-capacitive.dtbo \
overlays/pitft35-resistive.dtbo \
overlays/pps-gpio.dtbo \
overlays/rpi-ft5406.dtbo \
diff --git a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf
index 638c2ea5f..f1b81519f 100644
--- a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf
+++ b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf
@@ -6,7 +6,6 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
require conf/machine/include/tune-cortexa7.inc
include conf/machine/include/rpi-base.inc
-KBUILD_DEFCONFIG ?= "bcm2709_defconfig"
SDIMG_KERNELIMAGE ?= "kernel7.img"
UBOOT_MACHINE = "rpi_3_32b_config"
SERIAL_CONSOLES ?= "115200;ttyAMA0"
diff --git a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf
index 2bf62ef2b..633d18801 100644
--- a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf
+++ b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf
@@ -4,6 +4,7 @@
MACHINEOVERRIDES = "raspberrypi4:${MACHINE}"
+MACHINE_FEATURES += "pci"
MACHINE_EXTRA_RRECOMMENDS += "\
linux-firmware-rpidistro-bcm43455 \
bluez-firmware-rpidistro-bcm4345c0-hcd \
diff --git a/meta-raspberrypi/conf/machine/raspberrypi4.conf b/meta-raspberrypi/conf/machine/raspberrypi4.conf
index 1bcf9311d..d6b1d1bd0 100644
--- a/meta-raspberrypi/conf/machine/raspberrypi4.conf
+++ b/meta-raspberrypi/conf/machine/raspberrypi4.conf
@@ -6,6 +6,7 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
require conf/machine/include/tune-cortexa7.inc
include conf/machine/include/rpi-base.inc
+MACHINE_FEATURES += "pci"
MACHINE_EXTRA_RRECOMMENDS += "\
linux-firmware-rpidistro-bcm43455 \
bluez-firmware-rpidistro-bcm4345c0-hcd \