meta-yocto-bsp: Remove superfluous OVERRIDES in machine conf files

In machine configuration files, there is no need to use OVERRIDES that
match the precise machine being defined, so remove them for clarity
and consistency from these lines in those respective files:

  PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "4.10%"
  PREFERRED_VERSION_linux-yocto_genericx86 ?= "4.10%"
  UBOOT_MACHINE_mpc8315e-rdb = "MPC8315ERDB_config"

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf
index 514265e57352911141855245a29c17e6ee8c49e6..bfedd84c3072185d869ce0d6a88df88afcbaa815 100644 (file)
--- a/meta-yocto-bsp/conf/machine/genericx86-64.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf
@@ -7,6 +7,6 @@ DEFAULTTUNE ?= "core2-64"
 require conf/machine/include/tune-core2.inc
 require conf/machine/include/genericx86-common.inc
 
-PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "4.10%"
+PREFERRED_VERSION_linux-yocto ?= "4.10%"
 
 SERIAL_CONSOLES_CHECK = "ttyS0"

diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index 34a52c3f7e6cb27617b2eed65411e28dcc09f000..af03b868936177ad61cfe35b064ea7e4d67b3e11 100644 (file)
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -9,4 +9,4 @@ require conf/machine/include/genericx86-common.inc
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
 
-PREFERRED_VERSION_linux-yocto_genericx86 ?= "4.10%"
+PREFERRED_VERSION_linux-yocto ?= "4.10%"

diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index 66dbd6944e0bbba67c3e99d2c30a526e77c78091..2c4fdc6f2be99d1684bc934c65af9b3dae6e596e 100644 (file)
--- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
@@ -8,7 +8,7 @@ require conf/machine/include/tune-ppce300c3.inc
 KERNEL_IMAGETYPE = "uImage"
 
 EXTRA_IMAGEDEPENDS += "u-boot"
-UBOOT_MACHINE_mpc8315e-rdb = "MPC8315ERDB_config"
+UBOOT_MACHINE = "MPC8315ERDB_config"
 
 SERIAL_CONSOLE = "115200 ttyS0"