All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] qemuarm: update to ARMv7
@ 2019-01-18 22:17 Jon Mason
  2019-01-18 22:17 ` [PATCH 1/3] qemuarma15: ARM A15 Support Jon Mason
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Jon Mason @ 2019-01-18 22:17 UTC (permalink / raw)
  To: openembedded-core

This series of patches allows for qemuarm to be a more modern and
(hopefully) faster platform to test on by default.  Firstly, it
introduces a QEMU ARMv7 based Cortex-A15 system (of machine type virt).
It then renames the existing qemuarm machine to qemarmv5 to allow for it
to be used by those who still want to use it.  Finally, it renames the
newly introduced qemuarma15 to qemuarm.

Jon Mason (3):
  qemuarma15: ARM A15 Support
  qemuarm: rename to qemuarmv5
  qemuarm: Rename qemuarma15 to qemuarm

 meta/conf/machine/qemuarm.conf                | 29 +++++++++++--------
 meta/conf/machine/qemuarmv5.conf              | 21 ++++++++++++++
 .../linux/linux-yocto-rt_4.18.bb              |  4 +--
 .../linux/linux-yocto-rt_4.19.bb              |  4 +--
 .../linux/linux-yocto-tiny_4.18.bb            |  8 ++---
 .../linux/linux-yocto-tiny_4.19.bb            |  8 ++---
 meta/recipes-kernel/linux/linux-yocto_4.18.bb |  8 ++---
 meta/recipes-kernel/linux/linux-yocto_4.19.bb |  8 ++---
 8 files changed, 58 insertions(+), 32 deletions(-)
 create mode 100644 meta/conf/machine/qemuarmv5.conf

-- 
2.17.2



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] qemuarma15: ARM A15 Support
  2019-01-18 22:17 [PATCH 0/3] qemuarm: update to ARMv7 Jon Mason
@ 2019-01-18 22:17 ` Jon Mason
  2019-01-22  0:56   ` Randy MacLeod
  2019-01-18 22:17 ` [PATCH 2/3] qemuarm: rename to qemuarmv5 Jon Mason
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Jon Mason @ 2019-01-18 22:17 UTC (permalink / raw)
  To: openembedded-core

Add new QEMU BSP for a Arm Cortex-A15 system.  This uses the QEMU virt
machine type, which should be faster to emulate.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 meta/conf/machine/qemuarma15.conf             | 26 +++++++++++++++++++
 .../linux/linux-yocto-rt_4.19.bb              |  2 +-
 .../linux/linux-yocto-tiny_4.19.bb            |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb |  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 meta/conf/machine/qemuarma15.conf

diff --git a/meta/conf/machine/qemuarma15.conf b/meta/conf/machine/qemuarma15.conf
new file mode 100644
index 0000000000..f1c2246ebf
--- /dev/null
+++ b/meta/conf/machine/qemuarma15.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@NAME: generic Arm Cortex-A15 machine
+#@DESCRIPTION: Machine configuration for running a generic armv7
+
+require conf/machine/include/tune-cortexa15.inc
+require conf/machine/include/qemu.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MEM = "-m 512"
+QB_MACHINE = "-machine virt"
+QB_CPU = "-cpu cortex-a15 -smp 8"
+# We need both ttyAMA0 and hvc0 to allow for this to work in the stdio mode or the normal mode
+QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=hvc0,115200"
+QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci -monitor null"
+QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
+QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
+QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
+QB_SERIAL_OPT = "-device virtio-serial-device -chardev vc,id=virtcon -device virtconsole,chardev=virtcon"
+QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"
+
+PREFERRED_VERSION_linux-yocto ?= "4.19%"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index 4a987d52c0..89b6c8db86 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -31,7 +31,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarma15|qemuarm64|qemuppc|qemumips)"
 
 KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index 8506f7c880..e1ab7017cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -24,7 +24,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
 
-COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm"
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarma15"
 
 # Functionality flags
 KERNEL_FEATURES = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index bd9b6a3543..81fceee98f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -37,7 +37,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
 
-COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
+COMPATIBLE_MACHINE = "qemuarm|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-- 
2.17.2



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/3] qemuarm: rename to qemuarmv5
  2019-01-18 22:17 [PATCH 0/3] qemuarm: update to ARMv7 Jon Mason
  2019-01-18 22:17 ` [PATCH 1/3] qemuarma15: ARM A15 Support Jon Mason
@ 2019-01-18 22:17 ` Jon Mason
  2019-01-18 22:17 ` [PATCH 3/3] qemuarm: Rename qemuarma15 to qemuarm Jon Mason
  2019-01-19 12:15 ` [PATCH 0/3] qemuarm: update to ARMv7 Richard Purdie
  3 siblings, 0 replies; 7+ messages in thread
From: Jon Mason @ 2019-01-18 22:17 UTC (permalink / raw)
  To: openembedded-core

Rename qemuarm to qemuarmv5.  This will allow for qemuarma15 to be
renamed to qemuarm, while maintaining the ability to use the existing
setup for backward compatibility and testing.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 meta/conf/machine/{qemuarm.conf => qemuarmv5.conf} | 2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb   | 4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb   | 4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb | 8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 ++++----
 meta/recipes-kernel/linux/linux-yocto_4.18.bb      | 8 ++++----
 meta/recipes-kernel/linux/linux-yocto_4.19.bb      | 8 ++++----
 7 files changed, 21 insertions(+), 21 deletions(-)
 rename meta/conf/machine/{qemuarm.conf => qemuarmv5.conf} (95%)

diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarmv5.conf
similarity index 95%
rename from meta/conf/machine/qemuarm.conf
rename to meta/conf/machine/qemuarmv5.conf
index a544312627..9b72d0d90b 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -17,5 +17,5 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
 QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
-PREFERRED_VERSION_linux-yocto ??= "4.18%"
+PREFERRED_VERSION_linux-yocto ?= "4.19%"
 QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
index e862e8d654..2905041f96 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
@@ -31,9 +31,9 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarmv5|qemuarm64|qemuppc|qemumips)"
 
-KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index 89b6c8db86..d518677f42 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -31,9 +31,9 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarma15|qemuarm64|qemuppc|qemumips)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarmv5|qemuarma15|qemuarm64|qemuppc|qemumips)"
 
-KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
index 41765b5251..71319d395f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
@@ -1,5 +1,5 @@
 KBRANCH ?= "v4.18/standard/tiny/base"
-KBRANCH_qemuarm  ?= "v4.15/standard/tiny/arm-versatile-926ejs"
+KBRANCH_qemuarmv5  ?= "v4.15/standard/tiny/arm-versatile-926ejs"
 
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "c2892e0099ce0b5f6effa3f925ff1a9c83e57997"
+SRCREV_machine_qemuarmv5 ?= "c2892e0099ce0b5f6effa3f925ff1a9c83e57997"
 SRCREV_machine ?= "db2d813869a0501782469ecdb17e277a501c9f57"
 SRCREV_meta ?= "9e348b6f9db185cb60a34d18fd14a18b5def2c31"
 
@@ -24,9 +24,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
 
-COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm"
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarmv5"
 
 # Functionality flags
 KERNEL_FEATURES = ""
 
-KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index e1ab7017cf..a51270f731 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -1,5 +1,5 @@
 KBRANCH ?= "v4.19/standard/tiny/base"
-KBRANCH_qemuarm  ?= "v4.15/standard/tiny/arm-versatile-926ejs"
+KBRANCH_qemuarmv5  ?= "v4.15/standard/tiny/arm-versatile-926ejs"
 
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "d11db6c6617f689e6b9e2afaa3d3b2036c6d3d30"
+SRCREV_machine_qemuarmv5 ?= "d11db6c6617f689e6b9e2afaa3d3b2036c6d3d30"
 SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
 SRCREV_meta ?= "d9a3d567a7b5617f757d132090ca1646e139301f"
 
@@ -24,9 +24,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
 
-COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarma15"
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarmv5|qemuarma15"
 
 # Functionality flags
 KERNEL_FEATURES = ""
 
-KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
index e8ecc8f55a..a1edb84e98 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
@@ -3,7 +3,7 @@ KBRANCH ?= "v4.18/standard/base"
 require recipes-kernel/linux/linux-yocto.inc
 
 # board specific branches
-KBRANCH_qemuarm  ?= "v4.18/standard/arm-versatile-926ejs"
+KBRANCH_qemuarmv5  ?= "v4.18/standard/arm-versatile-926ejs"
 KBRANCH_qemuarm64 ?= "v4.18/standard/qemuarm64"
 KBRANCH_qemumips ?= "v4.18/standard/mti-malta32"
 KBRANCH_qemuppc  ?= "v4.18/standard/qemuppc"
@@ -11,7 +11,7 @@ KBRANCH_qemux86  ?= "v4.18/standard/base"
 KBRANCH_qemux86-64 ?= "v4.18/standard/base"
 KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "5a58952eb0d5ff7553e3eb53c65ef70b91b01c64"
+SRCREV_machine_qemuarmv5 ?= "5a58952eb0d5ff7553e3eb53c65ef70b91b01c64"
 SRCREV_machine_qemuarm64 ?= "db2d813869a0501782469ecdb17e277a501c9f57"
 SRCREV_machine_qemumips ?= "fe54f591b6f365c8af386981b57714ccef0a9381"
 SRCREV_machine_qemuppc ?= "db2d813869a0501782469ecdb17e277a501c9f57"
@@ -35,9 +35,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
-COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
+COMPATIBLE_MACHINE = "qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index 81fceee98f..69ae644417 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -3,7 +3,7 @@ KBRANCH ?= "v4.19/standard/base"
 require recipes-kernel/linux/linux-yocto.inc
 
 # board specific branches
-KBRANCH_qemuarm  ?= "v4.19/standard/arm-versatile-926ejs"
+KBRANCH_qemuarmv5  ?= "v4.19/standard/arm-versatile-926ejs"
 KBRANCH_qemuarm64 ?= "v4.19/standard/qemuarm64"
 KBRANCH_qemumips ?= "v4.19/standard/mti-malta32"
 KBRANCH_qemuppc  ?= "v4.19/standard/qemuppc"
@@ -11,7 +11,7 @@ KBRANCH_qemux86  ?= "v4.19/standard/base"
 KBRANCH_qemux86-64 ?= "v4.19/standard/base"
 KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "b960e1b087a8b0f192e5a9a3441dd47aecfa7d48"
+SRCREV_machine_qemuarmv5 ?= "b960e1b087a8b0f192e5a9a3441dd47aecfa7d48"
 SRCREV_machine_qemuarm64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
 SRCREV_machine_qemumips ?= "99a57b9439d36397ce975cc45ab23264c02b96d4"
 SRCREV_machine_qemuppc ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
@@ -35,9 +35,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
-COMPATIBLE_MACHINE = "qemuarm|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
+COMPATIBLE_MACHINE = "qemuarmv5|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-- 
2.17.2



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/3] qemuarm: Rename qemuarma15 to qemuarm
  2019-01-18 22:17 [PATCH 0/3] qemuarm: update to ARMv7 Jon Mason
  2019-01-18 22:17 ` [PATCH 1/3] qemuarma15: ARM A15 Support Jon Mason
  2019-01-18 22:17 ` [PATCH 2/3] qemuarm: rename to qemuarmv5 Jon Mason
@ 2019-01-18 22:17 ` Jon Mason
  2019-01-19 12:15 ` [PATCH 0/3] qemuarm: update to ARMv7 Richard Purdie
  3 siblings, 0 replies; 7+ messages in thread
From: Jon Mason @ 2019-01-18 22:17 UTC (permalink / raw)
  To: openembedded-core

Rename qemuarma15 to qemuarm.  This makes the default QEMU Arm setup to
emulate the more modern ARMv7 Cortex-A.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 meta/conf/machine/{qemuarma15.conf => qemuarm.conf} | 0
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb    | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb  | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/conf/machine/{qemuarma15.conf => qemuarm.conf} (100%)

diff --git a/meta/conf/machine/qemuarma15.conf b/meta/conf/machine/qemuarm.conf
similarity index 100%
rename from meta/conf/machine/qemuarma15.conf
rename to meta/conf/machine/qemuarm.conf
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index d518677f42..a0476540e1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -31,7 +31,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarmv5|qemuarma15|qemuarm64|qemuppc|qemumips)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarmv5|qemuarm|qemuarm64|qemuppc|qemumips)"
 
 KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index a51270f731..caf46a1c09 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -24,7 +24,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
 
-COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarmv5|qemuarma15"
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarmv5|qemuarm"
 
 # Functionality flags
 KERNEL_FEATURES = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index 69ae644417..505164bced 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -37,7 +37,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
-COMPATIBLE_MACHINE = "qemuarmv5|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
+COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-- 
2.17.2



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] qemuarm: update to ARMv7
  2019-01-18 22:17 [PATCH 0/3] qemuarm: update to ARMv7 Jon Mason
                   ` (2 preceding siblings ...)
  2019-01-18 22:17 ` [PATCH 3/3] qemuarm: Rename qemuarma15 to qemuarm Jon Mason
@ 2019-01-19 12:15 ` Richard Purdie
  2019-01-19 15:35   ` Khem Raj
  3 siblings, 1 reply; 7+ messages in thread
From: Richard Purdie @ 2019-01-19 12:15 UTC (permalink / raw)
  To: Jon Mason, openembedded-core

On Fri, 2019-01-18 at 17:17 -0500, Jon Mason wrote:
> This series of patches allows for qemuarm to be a more modern and
> (hopefully) faster platform to test on by default.  Firstly, it
> introduces a QEMU ARMv7 based Cortex-A15 system (of machine type
> virt).
> It then renames the existing qemuarm machine to qemarmv5 to allow for
> it
> to be used by those who still want to use it.  Finally, it renames
> the
> newly introduced qemuarma15 to qemuarm.
> 
> Jon Mason (3):
>   qemuarma15: ARM A15 Support
>   qemuarm: rename to qemuarmv5
>   qemuarm: Rename qemuarma15 to qemuarm

Thanks, looking forward to sorting this out!

Unfortunately it failed in testing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/38/builds/191/steps/7/logs/step1c

(the rest of the build is ongoing)

Cheers,

Richard



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] qemuarm: update to ARMv7
  2019-01-19 12:15 ` [PATCH 0/3] qemuarm: update to ARMv7 Richard Purdie
@ 2019-01-19 15:35   ` Khem Raj
  0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2019-01-19 15:35 UTC (permalink / raw)
  To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer

On Sat, Jan 19, 2019 at 4:16 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Fri, 2019-01-18 at 17:17 -0500, Jon Mason wrote:
> > This series of patches allows for qemuarm to be a more modern and
> > (hopefully) faster platform to test on by default.  Firstly, it
> > introduces a QEMU ARMv7 based Cortex-A15 system (of machine type
> > virt).
> > It then renames the existing qemuarm machine to qemarmv5 to allow for
> > it
> > to be used by those who still want to use it.  Finally, it renames
> > the
> > newly introduced qemuarma15 to qemuarm.
> >
> > Jon Mason (3):
> >   qemuarma15: ARM A15 Support
> >   qemuarm: rename to qemuarmv5
> >   qemuarm: Rename qemuarma15 to qemuarm
>
> Thanks, looking forward to sorting this out!
>
> Unfortunately it failed in testing:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/38/builds/191/steps/7/logs/step1c
>
> (the rest of the build is ongoing)
>

indeed this is a long standing wish of mine too.
I have staged it foe meta oe builds too

> Cheers,
>
> Richard
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] qemuarma15: ARM A15 Support
  2019-01-18 22:17 ` [PATCH 1/3] qemuarma15: ARM A15 Support Jon Mason
@ 2019-01-22  0:56   ` Randy MacLeod
  0 siblings, 0 replies; 7+ messages in thread
From: Randy MacLeod @ 2019-01-22  0:56 UTC (permalink / raw)
  To: Jon Mason, openembedded-core

On 1/18/19 5:17 PM, Jon Mason wrote:
> Add new QEMU BSP for a Arm Cortex-A15 system.  This uses the QEMU virt
> machine type, which should be faster to emulate.
> 
> Signed-off-by: Jon Mason <jdmason@kudzu.us>
> ---
>   meta/conf/machine/qemuarma15.conf             | 26 +++++++++++++++++++
>   .../linux/linux-yocto-rt_4.19.bb              |  2 +-
>   .../linux/linux-yocto-tiny_4.19.bb            |  2 +-
>   meta/recipes-kernel/linux/linux-yocto_4.19.bb |  2 +-
>   4 files changed, 29 insertions(+), 3 deletions(-)
>   create mode 100644 meta/conf/machine/qemuarma15.conf
> 
> diff --git a/meta/conf/machine/qemuarma15.conf b/meta/conf/machine/qemuarma15.conf
> new file mode 100644
> index 0000000000..f1c2246ebf
> --- /dev/null
> +++ b/meta/conf/machine/qemuarma15.conf
> @@ -0,0 +1,26 @@
> +#@TYPE: Machine
> +#@NAME: generic Arm Cortex-A15 machine
> +#@DESCRIPTION: Machine configuration for running a generic armv7
> +
> +require conf/machine/include/tune-cortexa15.inc
> +require conf/machine/include/qemu.inc
> +
> +KERNEL_IMAGETYPE = "zImage"
> +
> +SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
> +
> +# For runqemu
> +QB_SYSTEM_NAME = "qemu-system-arm"
> +QB_MEM = "-m 512"
> +QB_MACHINE = "-machine virt"
> +QB_CPU = "-cpu cortex-a15 -smp 8"

The other qemu .conf files do not specify smp so we should probably
drop it here too.

Typically it's an option for runqemu:
   $ runqemu foo bar qemuparams="-smp 8"

If you do want to keep if for some reason, 2 or 4 may be better
choices for people with modest build/test machines.

../Randy

> +# We need both ttyAMA0 and hvc0 to allow for this to work in the stdio mode or the normal mode
> +QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=hvc0,115200"
> +QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci -monitor null"
> +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
> +QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
> +QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
> +QB_SERIAL_OPT = "-device virtio-serial-device -chardev vc,id=virtcon -device virtconsole,chardev=virtcon"
> +QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"
> +
> +PREFERRED_VERSION_linux-yocto ?= "4.19%"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> index 4a987d52c0..89b6c8db86 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> @@ -31,7 +31,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
>   
>   LINUX_KERNEL_TYPE = "preempt-rt"
>   
> -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)"
> +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarma15|qemuarm64|qemuppc|qemumips)"
>   
>   KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
>   
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> index 8506f7c880..e1ab7017cf 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> @@ -24,7 +24,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
>   SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
>              git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
>   
> -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm"
> +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarma15"
>   
>   # Functionality flags
>   KERNEL_FEATURES = ""
> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> index bd9b6a3543..81fceee98f 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> @@ -37,7 +37,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
>   
>   KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
>   
> -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
> +COMPATIBLE_MACHINE = "qemuarm|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
>   
>   # Functionality flags
>   KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
> 


-- 
# Randy MacLeod
# Wind River Linux


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-01-22  0:56 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-18 22:17 [PATCH 0/3] qemuarm: update to ARMv7 Jon Mason
2019-01-18 22:17 ` [PATCH 1/3] qemuarma15: ARM A15 Support Jon Mason
2019-01-22  0:56   ` Randy MacLeod
2019-01-18 22:17 ` [PATCH 2/3] qemuarm: rename to qemuarmv5 Jon Mason
2019-01-18 22:17 ` [PATCH 3/3] qemuarm: Rename qemuarma15 to qemuarm Jon Mason
2019-01-19 12:15 ` [PATCH 0/3] qemuarm: update to ARMv7 Richard Purdie
2019-01-19 15:35   ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.