diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
commit | 35a774200999ac2fca48693c1c169bf99d2f63ea (patch) | |
tree | 0b2f65ce3a90f41d1c2542d0fd20b1604fd83fe5 /meta-raspberrypi/conf | |
parent | 497a23ef6661ad6ca7b75009e48a592c1620d46c (diff) | |
download | openbmc-2.8.0-rc1.tar.xz |
Reset the following subtrees on HEAD:
poky: ed3bdd7fbc(dunfell)
meta-raspberrypi: 8066fac91d(dunfell)
meta-security: d83f7cb0c9(dunfell)
meta-openembedded: e413c1ef62(dunfell)
Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-raspberrypi/conf')
5 files changed, 17 insertions, 5 deletions
diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index c958587b2b..4ed79591fc 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior zeus" +LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior zeus dunfell" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" @@ -32,3 +32,6 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ " + +DEFAULT_TEST_SUITES_remove_rpi = "parselogs" +DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 9772fd9d65..7a87bd13a0 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -5,7 +5,7 @@ include conf/machine/include/rpi-default-providers.inc SOC_FAMILY = "rpi" include conf/machine/include/soc-family.inc -IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" +IMAGE_FSTYPES ?= "tar.bz2 ext3 wic.bz2 wic.bmap" WKS_FILE ?= "sdimage-raspberrypi.wks" XSERVER = " \ @@ -16,6 +16,7 @@ XSERVER = " \ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ overlays/dwc2.dtbo \ overlays/gpio-key.dtbo \ overlays/hifiberry-amp.dtbo \ @@ -25,9 +26,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/i2c-rtc.dtbo \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ + overlays/miniuart-bt.dtbo \ overlays/mcp2515-can0.dtbo \ - overlays/pi3-disable-bt.dtbo \ - overlays/pi3-miniuart-bt.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ overlays/pitft28-capacitive.dtbo \ @@ -76,7 +76,9 @@ MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa blue # Raspberry Pi has no hardware clock MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}" + # Set Raspberrypi splash image SPLASH = "psplash-raspberrypi" diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 5231a84e1c..181b9364ba 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -8,3 +8,8 @@ PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "v PREFERRED_PROVIDER_virtual/mesa ?= "${@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" + +PREFERRED_PROVIDER_virtual/libomxil ?= "userland" +VIRTUAL-RUNTIME_libomxil = "userland" + +PREFERRED_PROVIDER_u-boot-default-script ??= "rpi-u-boot-scr" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 23b59ed955..65e3302c3d 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -31,4 +31,5 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image" KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" +VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub8.bin" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3.conf b/meta-raspberrypi/conf/machine/raspberrypi3.conf index 581e47c8f5..dafb66e5a0 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -17,4 +17,5 @@ SDIMG_KERNELIMAGE ?= "kernel7.img" UBOOT_MACHINE = "rpi_3_32b_config" SERIAL_CONSOLES ?= "115200;ttyS0" +VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub7.bin" |