All of lore.kernel.org
 help / color / mirror / Atom feed
From: Romain Naour <romain.naour@smile.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 for-next 03/11] board/qemu/arm-versatile: move arm-versatile nommu stuff to board/qemu/arm-versatile-nommu
Date: Sun, 17 Nov 2019 21:19:01 +0100	[thread overview]
Message-ID: <20191117201909.12900-4-romain.naour@smile.fr> (raw)
In-Reply-To: <20191117201909.12900-1-romain.naour@smile.fr>

In order to indroduce automated gitlab testing for all qemu defconfig,
split arm-versatile (MMU) and arm-versatile (noMMU) to a separate
directory.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 .../linux-nommu.config => arm-versatile-nommu/linux.config}   | 0
 .../patches/linux/versatile-nommu.patch                       | 0
 board/qemu/{arm-versatile => arm-versatile-nommu}/readme.txt  | 4 ----
 board/qemu/arm-versatile/readme.txt                           | 4 ----
 configs/qemu_arm_versatile_nommu_defconfig                    | 4 ++--
 5 files changed, 2 insertions(+), 10 deletions(-)
 rename board/qemu/{arm-versatile/linux-nommu.config => arm-versatile-nommu/linux.config} (100%)
 rename board/qemu/{arm-versatile => arm-versatile-nommu}/patches/linux/versatile-nommu.patch (100%)
 copy board/qemu/{arm-versatile => arm-versatile-nommu}/readme.txt (53%)

diff --git a/board/qemu/arm-versatile/linux-nommu.config b/board/qemu/arm-versatile-nommu/linux.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-nommu.config
rename to board/qemu/arm-versatile-nommu/linux.config
diff --git a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/board/qemu/arm-versatile-nommu/patches/linux/versatile-nommu.patch
similarity index 100%
rename from board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
rename to board/qemu/arm-versatile-nommu/patches/linux/versatile-nommu.patch
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile-nommu/readme.txt
similarity index 53%
copy from board/qemu/arm-versatile/readme.txt
copy to board/qemu/arm-versatile-nommu/readme.txt
index f3a9e1ab47..d25cc4dc00 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile-nommu/readme.txt
@@ -1,9 +1,5 @@
 Run the emulation with:
 
-  qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user
-
-Or for the noMMU emulation:
-
   qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111
 
 The login prompt will appear in the terminal that started Qemu. The
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index f3a9e1ab47..e514cefe82 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -2,10 +2,6 @@ Run the emulation with:
 
   qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user
 
-Or for the noMMU emulation:
-
-  qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111
-
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig
index ae4353d0a5..c4fefeef48 100644
--- a/configs/qemu_arm_versatile_nommu_defconfig
+++ b/configs/qemu_arm_versatile_nommu_defconfig
@@ -7,7 +7,7 @@ BR2_PACKAGE_HOST_ELF2FLT=y
 # BR2_USE_MMU is not set
 
 # Patches
-BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile/patches"
+BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile-nommu/patches"
 
 # Busybox with hush
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
@@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile-nommu/linux.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb"
 
-- 
2.21.0

  parent reply	other threads:[~2019-11-17 20:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-17 20:18 [Buildroot] [PATCH v3 for-next 00/11] gitlab Qemu runtime testing Romain Naour
2019-11-17 20:18 ` [Buildroot] [PATCH v3 for-next 01/11] configs/qemu_m68k_q800: remove host-qemu Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 02/11] configs/qemu{x86, x86_64}: add a serial console Romain Naour
2019-11-22 11:27   ` Carlos Santos
2019-11-22 12:42     ` Romain Naour
2019-11-17 20:19 ` Romain Naour [this message]
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 04/11] board/qemu/csky: move csky610 stuff to board/qemu/csky610-virt Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 05/11] board/qemu/csky: move csky807 stuff to board/qemu/csky807-virt Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 06/11] board/qemu/csky: move csky810 stuff to board/qemu/csky810-virt Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 07/11] board/qemu/csky: move csky860 stuff to board/qemu/csky860-virt Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 08/11] board/qemu/*/launch.sh: add qemu launch script Romain Naour
2019-11-21 21:42   ` Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 09/11] configs/qemu-*: add a comment to provide the path launch.sh script for each Qemu defconfig Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 10/11] support/scripts/boot-qemu-image.py: boot Qemu images with Qemu-system Romain Naour
2019-11-17 20:19 ` [Buildroot] [PATCH v3 for-next 11/11] gitlab.yml.in*: enable Qemu gitlab testing Romain Naour
2019-12-14 20:48 ` [Buildroot] [PATCH v3 for-next 00/11] gitlab Qemu runtime testing Romain Naour
2019-12-18 22:50   ` Arnout Vandecappelle
2019-12-19 11:11     ` Peter Korsgaard
2020-02-04 13:59       ` Romain Naour
2020-02-04 14:31         ` Arnout Vandecappelle
2020-02-04 17:20           ` Romain Naour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191117201909.12900-4-romain.naour@smile.fr \
    --to=romain.naour@smile.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.