diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2017-03-16 07:40:42 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-22 11:35:23 +0000 |
| commit | 49c2df5652d25e6e9b2a4976658ab9bb17fe6694 (patch) | |
| tree | 25b546e38f62fc9ea74595a42506794267ab5448 /meta-yocto-bsp/conf | |
| parent | 1ff2ece700dfb71b1c5eedfa6d0ce17744e55be4 (diff) | |
| download | poky-49c2df5652d25e6e9b2a4976658ab9bb17fe6694.tar.gz | |
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"
(From meta-yocto rev: 035d4e7763171068d2b4df0622b6cc0fc1cf4b32)
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>
Diffstat (limited to 'meta-yocto-bsp/conf')
| -rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 514265e573..bfedd84c30 100644 --- 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" | |||
| 7 | require conf/machine/include/tune-core2.inc | 7 | require conf/machine/include/tune-core2.inc |
| 8 | require conf/machine/include/genericx86-common.inc | 8 | require conf/machine/include/genericx86-common.inc |
| 9 | 9 | ||
| 10 | PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "4.10%" | 10 | PREFERRED_VERSION_linux-yocto ?= "4.10%" |
| 11 | 11 | ||
| 12 | SERIAL_CONSOLES_CHECK = "ttyS0" | 12 | SERIAL_CONSOLES_CHECK = "ttyS0" |
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 34a52c3f7e..af03b86893 100644 --- 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 | |||
| 9 | 9 | ||
| 10 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" | 10 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" |
| 11 | 11 | ||
| 12 | PREFERRED_VERSION_linux-yocto_genericx86 ?= "4.10%" | 12 | 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 66dbd6944e..2c4fdc6f2b 100644 --- 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 | |||
| 8 | KERNEL_IMAGETYPE = "uImage" | 8 | KERNEL_IMAGETYPE = "uImage" |
| 9 | 9 | ||
| 10 | EXTRA_IMAGEDEPENDS += "u-boot" | 10 | EXTRA_IMAGEDEPENDS += "u-boot" |
| 11 | UBOOT_MACHINE_mpc8315e-rdb = "MPC8315ERDB_config" | 11 | UBOOT_MACHINE = "MPC8315ERDB_config" |
| 12 | 12 | ||
| 13 | SERIAL_CONSOLE = "115200 ttyS0" | 13 | SERIAL_CONSOLE = "115200 ttyS0" |
| 14 | 14 | ||