From bf9ad70bdaca6eacb0efc65a1924fe82f0a50684 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Thu, 28 Mar 2019 14:55:53 -0400 Subject: machine: clean up config files Beautify the machine config files by making the names and descriptions more uniform and verbose (From OE-Core rev: 1108a24e2c58794163c8cf35154f8be5c1d06c29) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm.conf | 4 ++-- meta/conf/machine/qemuarm64.conf | 4 ++-- meta/conf/machine/qemuarmv5.conf | 6 +++--- meta/conf/machine/qemumips.conf | 4 ++-- meta/conf/machine/qemumips64.conf | 4 ++-- meta/conf/machine/qemuppc.conf | 4 ++-- meta/conf/machine/qemux86-64.conf | 4 ++-- meta/conf/machine/qemux86.conf | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 9555046189..0a2c995312 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: generic Arm Cortex-A15 machine -#@DESCRIPTION: Machine configuration for running a generic armv7 +#@NAME: QEMU Arm Cortex-A15 machine +#@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU require conf/machine/include/tune-cortexa15.inc require conf/machine/include/qemu.inc diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 22f6cb742b..5c8aac1511 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: generic armv8 machine -#@DESCRIPTION: Machine configuration for running a generic armv8 +#@NAME: QEMU ARMv8 machine +#@DESCRIPTION: Machine configuration for running an ARMv8 system on QEMU require conf/machine/include/arm/arch-armv8a.inc require conf/machine/include/qemu.inc diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index e3948a25da..1c21d3342d 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: arm_versatile_926ejs -#@DESCRIPTION: arm_versatile_926ejs +#@NAME: QEMU ARM9 machine +#@DESCRIPTION: Machine configuration for running an ARMv5 system on QEMU require conf/machine/include/qemu.inc require conf/machine/include/tune-arm926ejs.inc @@ -20,4 +20,4 @@ QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virti PREFERRED_VERSION_linux-yocto ??= "5.0%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" -KMACHINE_qemuarmv5 = "qemuarm" \ No newline at end of file +KMACHINE_qemuarmv5 = "qemuarm" diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf index a60f67aa87..48d9f41d9d 100644 --- a/meta/conf/machine/qemumips.conf +++ b/meta/conf/machine/qemumips.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: mti_malta32_be MIPS -#@DESCRIPTION: mti_malta32_be +#@NAME: QEMU MIPS32 machine +#@DESCRIPTION: Machine configuration for running a MIPS system on QEMU require conf/machine/include/qemu.inc require conf/machine/include/tune-mips32r2.inc diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf index 970c0ce7ae..1872e7b62d 100644 --- a/meta/conf/machine/qemumips64.conf +++ b/meta/conf/machine/qemumips64.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: mti-malta64-be MIPS64 -#@DESCRIPTION: mti-malta64-be +#@NAME: QEMU MIPS64 machine +#@DESCRIPTION: Machine configuration for running a MIPS64 system on QEMU require conf/machine/include/qemu.inc require conf/machine/include/tune-mips64r2.inc diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 743d26170e..bd88eeb12a 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: qemu PPC Emulator setup -#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation +#@NAME: QEMU PPC machine +#@DESCRIPTION: Machine configuration for running a PPC system on QEMU require conf/machine/include/qemu.inc require conf/machine/include/tune-ppc7400.inc diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 9966d1a04c..383e3bd6f3 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for running a common x86 +#@NAME: QEMU x86-64 machine +#@DESCRIPTION: Machine configuration for running an x86-64 system on QEMU PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index e78fb6e87b..ae5187cbd5 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for running a common x86 +#@NAME: QEMU x86 machine +#@DESCRIPTION: Machine configuration for running an x86 system on QEMU PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -- cgit v1.2.3-54-g00ecf