summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 20:00:20 +0200
committerAndrei Gherzan <andrei@gherzan.com>2021-08-04 12:30:12 +0300
commit3f703e1b1d8c523ef244e24f316079c80e02b1ab (patch)
tree39d8380a646953388d13dd3aa9d7454088e1a6ca /conf
parent9ea7aa2cd2cdc775425797b689e782718896ea50 (diff)
downloadmeta-raspberrypi-3f703e1b1d8c523ef244e24f316079c80e02b1ab.tar.gz
Manually fix conversion
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf10
-rw-r--r--conf/machine/include/rpi-default-settings.inc4
-rw-r--r--conf/machine/raspberrypi3-64.conf2
-rw-r--r--conf/machine/raspberrypi4-64.conf2
4 files changed, 9 insertions, 9 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 944df21..c36c7e3 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,11 +6,11 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
6 ${LAYERDIR}/recipes*/*/*.bbappend" 6 ${LAYERDIR}/recipes*/*/*.bbappend"
7 7
8BBFILE_COLLECTIONS += "raspberrypi" 8BBFILE_COLLECTIONS += "raspberrypi"
9BBFILE_PATTERN:raspberrypi := "^${LAYERDIR}/" 9BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
10BBFILE_PRIORITY:raspberrypi = "9" 10BBFILE_PRIORITY_raspberrypi = "9"
11 11
12LAYERSERIES_COMPAT:raspberrypi = "hardknott honister" 12LAYERSERIES_COMPAT_raspberrypi = "hardknott honister"
13LAYERDEPENDS:raspberrypi = "core" 13LAYERDEPENDS_raspberrypi = "core"
14 14
15# Additional license directories. 15# Additional license directories.
16LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" 16LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
@@ -37,4 +37,4 @@ BBFILES_DYNAMIC += " \
37" 37"
38 38
39DEFAULT_TEST_SUITES:remove:rpi = "parselogs" 39DEFAULT_TEST_SUITES:remove:rpi = "parselogs"
40DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi" 40DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi"
diff --git a/conf/machine/include/rpi-default-settings.inc b/conf/machine/include/rpi-default-settings.inc
index a89ddb1..b788f14 100644
--- a/conf/machine/include/rpi-default-settings.inc
+++ b/conf/machine/include/rpi-default-settings.inc
@@ -3,7 +3,7 @@
3IMAGE_CLASSES += "sdcard_image-rpi" 3IMAGE_CLASSES += "sdcard_image-rpi"
4 4
5# RPI kernel has errors of its own which should be filtered 5# RPI kernel has errors of its own which should be filtered
6# therefore use parselogs:rpi test instead of parselogs from oe-core 6# therefore use parselogs_rpi test instead of parselogs from oe-core
7# 7#
8DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi" 8DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi"
9DEFAULT_TEST_SUITES:remove:rpi = " parselogs" 9DEFAULT_TEST_SUITES:remove:rpi = " parselogs"
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index 4ed2d2a..5394132 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -23,7 +23,7 @@ RPI_KERNEL_DEVICETREE = " \
23 23
24SERIAL_CONSOLES ?= "115200;ttyS0" 24SERIAL_CONSOLES ?= "115200;ttyS0"
25 25
26UBOOT_MACHINE = "rpi:arm64_config" 26UBOOT_MACHINE = "rpi_arm64_config"
27 27
28# When u-boot is enabled we need to use the "Image" format and the "booti" 28# When u-boot is enabled we need to use the "Image" format and the "booti"
29# command to load the kernel 29# command to load the kernel
diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf
index 99a2a7c..12c8954 100644
--- a/conf/machine/raspberrypi4-64.conf
+++ b/conf/machine/raspberrypi4-64.conf
@@ -22,7 +22,7 @@ RPI_KERNEL_DEVICETREE = " \
22SDIMG_KERNELIMAGE ?= "kernel8.img" 22SDIMG_KERNELIMAGE ?= "kernel8.img"
23SERIAL_CONSOLES ?= "115200;ttyS0" 23SERIAL_CONSOLES ?= "115200;ttyS0"
24 24
25UBOOT_MACHINE = "rpi:arm64_config" 25UBOOT_MACHINE = "rpi_arm64_config"
26 26
27VC4DTBO ?= "vc4-fkms-v3d" 27VC4DTBO ?= "vc4-fkms-v3d"
28 28