From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- meta-raspberrypi/conf/layer.conf | 7 +++++- meta-raspberrypi/conf/machine/include/rpi-base.inc | 26 +++++++++------------- meta-raspberrypi/conf/machine/raspberrypi-cm3.conf | 4 ++-- meta-raspberrypi/conf/machine/raspberrypi.conf | 3 +-- .../conf/machine/raspberrypi0-wifi.conf | 7 +++--- meta-raspberrypi/conf/machine/raspberrypi0.conf | 3 +-- meta-raspberrypi/conf/machine/raspberrypi2.conf | 3 +-- meta-raspberrypi/conf/machine/raspberrypi3-64.conf | 11 +++++---- meta-raspberrypi/conf/machine/raspberrypi3.conf | 11 +++++---- 9 files changed, 35 insertions(+), 40 deletions(-) (limited to 'meta-raspberrypi/conf') diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index cfc22342f..6e2fdf663 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" +LAYERSERIES_COMPAT_raspberrypi = "sumo thud" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" @@ -23,3 +23,8 @@ BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % for layer in BBFILE_COLLECTIONS.split())}" BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \ for layer in BBFILE_COLLECTIONS.split())}" + +BBFILES_DYNAMIC += " \ + 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-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 539d1bc12..4bbd576b9 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -15,7 +15,9 @@ XSERVER = " \ " RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ + overlays/at86rf233.dtbo \ overlays/dwc2.dtbo \ + overlays/gpio-key.dtbo \ overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ overlays/hifiberry-dacplus.dtbo \ @@ -24,18 +26,17 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ overlays/lirc-rpi.dtbo \ + overlays/pi3-disable-bt.dtbo \ + overlays/pi3-miniuart-bt.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/w1-gpio.dtbo \ - overlays/w1-gpio-pullup.dtbo \ - overlays/pi3-disable-bt.dtbo \ - overlays/pi3-miniuart-bt.dtbo \ overlays/vc4-kms-v3d.dtbo \ - overlays/at86rf233.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/w1-gpio.dtbo \ " RPI_KERNEL_DEVICETREE ?= " \ @@ -84,23 +85,18 @@ def make_dtb_boot_files(d): imgtyp = d.getVar('KERNEL_IMAGETYPE') def transform(dtb): + base = os.path.basename(dtb) if dtb.endswith('dtb'): # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb + # DEPLOYDIR file: bcm2708-rpi-b.dtb # destination: bcm2708-rpi-b.dtb - base = os.path.basename(dtb) - src = '{}-{}'.format(imgtyp, base) - dst = base - return '{};{}'.format(src, dst) + return base elif dtb.endswith('dtbo'): # overlay dtb: # eg: overlays/hifiberry-amp.dtbo has: - # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo + # DEPLOYDIR file: hifiberry-amp.dtbo # destination: overlays/hifiberry-amp.dtbo - base = os.path.basename(dtb) - src = '{}-{}'.format(imgtyp, base) - dst = dtb - return '{};{}'.format(src, dtb) + return '{};{}'.format(base, dtb) return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) diff --git a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf index 153d5d5bb..5f6d3b6bf 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf @@ -2,5 +2,5 @@ #@NAME: RaspberryPi Compute Module 3 (CM3) #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3) -MACHINEOVERRIDES = "raspberrypi2:${MACHINE}" -include conf/machine/raspberrypi2.conf +MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" +include conf/machine/raspberrypi3.conf diff --git a/meta-raspberrypi/conf/machine/raspberrypi.conf b/meta-raspberrypi/conf/machine/raspberrypi.conf index ddd380161..e94ad867e 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi.conf @@ -7,7 +7,6 @@ DEFAULTTUNE ?= "arm1176jzfshf" require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc -SERIAL_CONSOLE ?= "115200 ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" UBOOT_MACHINE = "rpi_config" -VC4_CMA_SIZE_raspberrypi ?= "cma-64" diff --git a/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf b/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf index accdf3ce3..2c4f760ea 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf @@ -7,11 +7,10 @@ require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-bcm43430 \ - linux-firmware-bcm43430a1-hcd \ + linux-firmware-rpidistro-bcm43430 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ " SDIMG_KERNELIMAGE ?= "kernel.img" UBOOT_MACHINE ?= "rpi_0_w_defconfig" -SERIAL_CONSOLE ?= "115200 ttyS0" -VC4_CMA_SIZE ?= "cma-128" +SERIAL_CONSOLES ?= "115200;ttyS0" diff --git a/meta-raspberrypi/conf/machine/raspberrypi0.conf b/meta-raspberrypi/conf/machine/raspberrypi0.conf index 3bd9e956e..80297b563 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi0.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi0.conf @@ -5,5 +5,4 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}" include conf/machine/raspberrypi.conf -SERIAL_CONSOLE ?= "115200 ttyAMA0" -VC4_CMA_SIZE ?= "cma-128" +SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/meta-raspberrypi/conf/machine/raspberrypi2.conf b/meta-raspberrypi/conf/machine/raspberrypi2.conf index a17289ce9..bd191c3fa 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi2.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi2.conf @@ -7,7 +7,6 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" require conf/machine/include/tune-cortexa7.inc include conf/machine/include/rpi-base.inc -SERIAL_CONSOLE ?= "115200 ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" UBOOT_MACHINE = "rpi_2_config" -VC4_CMA_SIZE ?= "cma-256" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index fb21b122c..635e4f67f 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -5,10 +5,10 @@ MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-bcm43430 \ - linux-firmware-bcm43455 \ - linux-firmware-bcm43430a1-hcd \ - linux-firmware-bcm4345c0-hcd \ + linux-firmware-rpidistro-bcm43430 \ + linux-firmware-rpidistro-bcm43455 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ + bluez-firmware-rpidistro-bcm4345c0-hcd \ " require conf/machine/include/arm/arch-armv8.inc @@ -20,8 +20,7 @@ RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2837-rpi-3-b.dtb \ " -SERIAL_CONSOLE ?= "115200 ttyS0" -VC4_CMA_SIZE ?= "cma-256" +SERIAL_CONSOLES ?= "115200;ttyS0" UBOOT_MACHINE = "rpi_3_config" MACHINE_FEATURES_append = " vc4graphics" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3.conf b/meta-raspberrypi/conf/machine/raspberrypi3.conf index 8b5cce51f..df64cbb7b 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -7,13 +7,12 @@ require conf/machine/include/tune-cortexa7.inc include conf/machine/include/rpi-base.inc MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-bcm43430 \ - linux-firmware-bcm43455 \ - linux-firmware-bcm43430a1-hcd \ - linux-firmware-bcm4345c0-hcd \ + linux-firmware-rpidistro-bcm43430 \ + linux-firmware-rpidistro-bcm43455 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ + bluez-firmware-rpidistro-bcm4345c0-hcd \ " SDIMG_KERNELIMAGE ?= "kernel7.img" UBOOT_MACHINE = "rpi_3_32b_config" -SERIAL_CONSOLE ?= "115200 ttyS0" -VC4_CMA_SIZE ?= "cma-256" +SERIAL_CONSOLES ?= "115200;ttyS0" -- cgit v1.2.1