diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2019-02-20 04:49:56 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2019-02-20 04:53:00 +0300 |
commit | 1c349149c6a4dd1b5bc36c2d24b65da7dfdf3fe7 (patch) | |
tree | 8e059236d8738039f5b37a16b42b060a31398e60 /meta-raspberrypi/conf | |
parent | 06d03021241302d8f2148145618557a9c57eb290 (diff) | |
download | openbmc-1c349149c6a4dd1b5bc36c2d24b65da7dfdf3fe7.tar.xz |
meta-raspberrypi: refresh thud: d5d92f2cb7..c71d79efc5
Update meta-raspberrypi to thud HEAD.
Andrei Gherzan (2):
raspberrypi-cm3.conf: Define it as a stand alone machine
docs/layer-contents.md: raspberrypi-cm3 is a stand alone machine now
Drew Moseley (1):
linux-raspberrypi: Update to 4.14.85
Hugo Hromic (1):
docs: improve the contributing section
Khem Raj (8):
dynamic-layers/qt5-layer: Append to oe-device-extra.pri instead of rewriting
bpftool: Disable for rpi until kernel is not > 4.14
packagegroup-meta-oe.bbappend: remove bpftool for rpi
Add meta-oe to dynamic-layers
layer.conf: Fix typo for openembedded-layer dynamic layer addition
bpftool: Move under meta-oe dynamic layer
qtbase: Get eglfs/kms working with vc4graphics
userland: Use original name libegl-mesa in rdeps
Marek Belisko (1):
devtools: Added raspi-gpio
Ming Liu (2):
rpi-default-providers.inc: use virtual/libgbm instead of libgbm
userland: do not provide libgl1
Pepijn de Vos (2):
firmware.inc: Update to 20181211
linux-raspberrypi: Update to 4.14.87
Ricardo Salveti (1):
bluez-firmware-rpidistro: update bluez-firmware
Richard Osterloh (1):
sdcard_image-rpi: Format boot partition as FAT32
Zahari Petkov (2):
linux-raspberrypi: Update to 4.14.98
firmware.inc: Update to 20190212
memox_5 (1):
rpi-config: used printf to escape properly
Change-Id: I36c776929c0ca91f06ab0f9bd93f1e2ce19cdf8b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-raspberrypi/conf')
-rw-r--r-- | meta-raspberrypi/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-raspberrypi/conf/machine/include/rpi-default-providers.inc | 2 | ||||
-rw-r--r-- | meta-raspberrypi/conf/machine/raspberrypi-cm3.conf | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index 6e2fdf6630..67eb98ff5d 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -25,6 +25,8 @@ BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer for layer in BBFILE_COLLECTIONS.split())}" BBFILES_DYNAMIC += " \ + openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ + openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ " diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 5b2658ba39..5231a84e1c 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -6,5 +6,5 @@ PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4 PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" -PREFERRED_PROVIDER_libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" +PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg" diff --git a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf index 5f6d3b6bfe..c8677b4ffa 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf @@ -2,5 +2,11 @@ #@NAME: RaspberryPi Compute Module 3 (CM3) #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3) -MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" -include conf/machine/raspberrypi3.conf +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" |