diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-25 22:29:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-29 23:38:21 +0100 |
commit | 9826f87cb466a85cba736529831175437dcc621a (patch) | |
tree | cbcabea97ff4d1225102495cd629888bbc384468 /meta-yocto-bsp/conf/machine | |
parent | d41af446febd516f14f26db53e6572d9eae35b1e (diff) | |
download | poky-9826f87cb466a85cba736529831175437dcc621a.tar.gz |
meta-poky/meta-yocto-bsp: Convert to new override syntax
This converts the two layers to the new override syntax. This was done using
<oe-core>/scripts/contrib/convert-overrides.py <this-layer>
with no manual fixes.
(From meta-yocto rev: 387eab70f343966267c2a68746aea1bbb8525191)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf/machine')
-rw-r--r-- | meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 04cbd3b5b7..65c79fd34d 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | |||
@@ -15,9 +15,9 @@ DEFAULTTUNE ?= "cortexa8hf-neon" | |||
15 | include conf/machine/include/tune-cortexa8.inc | 15 | include conf/machine/include/tune-cortexa8.inc |
16 | 16 | ||
17 | IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" | 17 | IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" |
18 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 18 | EXTRA_IMAGECMD:jffs2 = "-lnp " |
19 | WKS_FILE ?= "beaglebone-yocto.wks" | 19 | WKS_FILE ?= "beaglebone-yocto.wks" |
20 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" | 20 | IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage" |
21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" | 21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" |
22 | 22 | ||
23 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" | 23 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" |
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 1de069011d..59d96d1417 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
@@ -18,7 +18,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" | |||
18 | 18 | ||
19 | GLIBC_ADDONS = "nptl" | 19 | GLIBC_ADDONS = "nptl" |
20 | 20 | ||
21 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | 21 | EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" |
22 | 22 | ||
23 | IMAGE_FSTYPES += "wic wic.bmap" | 23 | IMAGE_FSTYPES += "wic wic.bmap" |
24 | WKS_FILE ?= "genericx86.wks.in" | 24 | WKS_FILE ?= "genericx86.wks.in" |