diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 20:00:20 +0200 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2021-08-04 12:30:12 +0300 |
| commit | 3f703e1b1d8c523ef244e24f316079c80e02b1ab (patch) | |
| tree | 39d8380a646953388d13dd3aa9d7454088e1a6ca /conf/machine | |
| parent | 9ea7aa2cd2cdc775425797b689e782718896ea50 (diff) | |
| download | meta-raspberrypi-3f703e1b1d8c523ef244e24f316079c80e02b1ab.tar.gz | |
Manually fix conversion
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/include/rpi-default-settings.inc | 4 | ||||
| -rw-r--r-- | conf/machine/raspberrypi3-64.conf | 2 | ||||
| -rw-r--r-- | conf/machine/raspberrypi4-64.conf | 2 |
3 files changed, 4 insertions, 4 deletions
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 @@ | |||
| 3 | IMAGE_CLASSES += "sdcard_image-rpi" | 3 | IMAGE_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 | # |
| 8 | DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi" | 8 | DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi" |
| 9 | DEFAULT_TEST_SUITES:remove:rpi = " parselogs" | 9 | DEFAULT_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 | ||
| 24 | SERIAL_CONSOLES ?= "115200;ttyS0" | 24 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 25 | 25 | ||
| 26 | UBOOT_MACHINE = "rpi:arm64_config" | 26 | UBOOT_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 = " \ | |||
| 22 | SDIMG_KERNELIMAGE ?= "kernel8.img" | 22 | SDIMG_KERNELIMAGE ?= "kernel8.img" |
| 23 | SERIAL_CONSOLES ?= "115200;ttyS0" | 23 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 24 | 24 | ||
| 25 | UBOOT_MACHINE = "rpi:arm64_config" | 25 | UBOOT_MACHINE = "rpi_arm64_config" |
| 26 | 26 | ||
| 27 | VC4DTBO ?= "vc4-fkms-v3d" | 27 | VC4DTBO ?= "vc4-fkms-v3d" |
| 28 | 28 | ||