diff options
Diffstat (limited to 'meta-yocto-bsp/conf')
-rw-r--r-- | meta-yocto-bsp/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/beaglebone-yocto.conf (renamed from meta-yocto-bsp/conf/machine/beaglebone.conf) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index 7b565f222a..e10056e046 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf | |||
@@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ | |||
8 | BBFILE_COLLECTIONS += "yoctobsp" | 8 | BBFILE_COLLECTIONS += "yoctobsp" |
9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_yoctobsp = "5" | 10 | BBFILE_PRIORITY_yoctobsp = "5" |
11 | LAYERVERSION_yoctobsp = "3" | 11 | LAYERVERSION_yoctobsp = "4" |
12 | LAYERSERIES_COMPAT_yoctobsp = "rocko" | 12 | LAYERSERIES_COMPAT_yoctobsp = "rocko" |
diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 1bdd4dfb70..990c967416 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: Beaglebone machine | 2 | #@NAME: Beaglebone-yocto machine |
3 | #@DESCRIPTION: Machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards | 3 | #@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards |
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
6 | XSERVER ?= "xserver-xorg \ | 6 | XSERVER ?= "xserver-xorg \ |
@@ -16,7 +16,7 @@ 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.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" | 21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |
22 | 22 | ||