Re: [U-Boot] [PATCH v2 5/6] ARM: Add a new arch + board for QEMU's 'virt' machine

23 Sep 2017

Hi Bin,
On 09/20/2017 08:02 AM, Bin Meng wrote:
...
Hi Tuomas,
On Wed, Sep 20, 2017 at 4:18 AM, Tuomas Tynkkynen
tuomas.tynkkynen@iki.fi wrote:
...
This board builds an U-Boot binary that is bootable with QEMU's 'virt'
machine on ARM. The minimal QEMU command line is:
 qemu-system-arm -machine virt,highmem=off -bios u-boot.bin


(Note that the 'highmem=off' parameter to the 'virt' machine is required for
PCI to work in U-Boot.) This command line enables the following:
     - u-boot.bin loaded and executing in the emulated flash at address 0x0
     - A generated device tree blob placed at the start of RAM
     - A freely configurable amount of RAM, described by the DTB
     - A PL011 serial port, discoverable via the DTB
     - An ARMv7 architected timer
     - PSCI for rebooting the system
     - A generic ECAM-based PCI host controller, discoverable via the DTB
Additionally, QEMU allows plugging a bunch of useful peripherals to the PCI bus.
The following ones are supported by both U-Boot and Linux:

To add a Serial ATA disk via an Intel ICH9 AHCI controller, pass e.g.:
   -drive if=none,file=disk.img,id=mydisk -device ich9-ahci,id=ahci -device ide-drive,drive=mydisk,bus=ahci.0
To add an Intel E1000 network adapter, pass e.g.:
   -net nic,model=e1000 -net user

With this parameter I got:
Warning: requested NIC (anonymous, model e1000) was not created (not
supported by this machine?)
I am using QEMU v2.5.0. It's better to mention the minimum required
QEMU version in the commit message as well.
I primarily tested with 2.9.0, but I found out that it will work in 
2.5.0 as well by changing the syntax to
     -netdev user,id=net0 -device e1000,netdev=net0
I will update the commit message accordingly.
...
...

To add an EHCI-compliant USB host controller, pass e.g.:
   -device usb-ehci,id=ehci
To add a NVMe disk, pass e.g.:
   -drive if=none,file=disk.img,id=mydisk -device nvme,drive=mydisk,serial=foo

Signed-off-by: Tuomas Tynkkynen tuomas.tynkkynen@iki.fi
v2:

enable CONFIG_NVME
alphasort correctly
remove unnecessary gd declaration
move board under board/emulation
add MAINTAINERS


arch/arm/Kconfig                     | 10 +++++++
  arch/arm/mach-qemu/Kconfig           | 12 ++++++++
  board/emulation/qemu-arm/MAINTAINERS |  6 ++++
  board/emulation/qemu-arm/Makefile    |  5 ++++
  board/emulation/qemu-arm/qemu-arm.c  | 33 ++++++++++++++++++++
  configs/qemu_arm_defconfig           | 28 +++++++++++++++++
  include/configs/qemu-arm.h           | 58 ++++++++++++++++++++++++++++++++++++
  7 files changed, 152 insertions(+)
  create mode 100644 arch/arm/mach-qemu/Kconfig
  create mode 100644 board/emulation/qemu-arm/MAINTAINERS
  create mode 100644 board/emulation/qemu-arm/Makefile
  create mode 100644 board/emulation/qemu-arm/qemu-arm.c
  create mode 100644 configs/qemu_arm_defconfig
  create mode 100644 include/configs/qemu-arm.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 53eae8953e..1de5be7a72 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -630,6 +630,14 @@ config ARCH_MX5
         select CPU_V7
         select BOARD_EARLY_INIT_F
+config ARCH_QEMU

  bool "QEMU Virtual Platform"


  select CPU_V7


  select ARCH_SUPPORT_PSCI


  select DM


  select DM_SERIAL


  select OF_CONTROL


config ARCH_RMOBILE
       bool "Renesas ARM SoCs"
       select DM

@@ -1142,6 +1150,8 @@ source "arch/arm/mach-rmobile/Kconfig"
source "arch/arm/mach-meson/Kconfig"
+source "arch/arm/mach-qemu/Kconfig"

source "arch/arm/mach-rockchip/Kconfig"
source "arch/arm/mach-s5pc1xx/Kconfig"


diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig
new file mode 100644
index 0000000000..3500b56cb0
--- /dev/null
+++ b/arch/arm/mach-qemu/Kconfig
@@ -0,0 +1,12 @@
+if ARCH_QEMU



+config SYS_VENDOR

  default "emulation"




+config SYS_BOARD

  default "qemu-arm"




+config SYS_CONFIG_NAME

  default "qemu-arm"




+endif
diff --git a/board/emulation/qemu-arm/MAINTAINERS b/board/emulation/qemu-arm/MAINTAINERS
new file mode 100644
index 0000000000..a803061ff4
--- /dev/null
+++ b/board/emulation/qemu-arm/MAINTAINERS
@@ -0,0 +1,6 @@
+QEMU ARM 'VIRT' BOARD
+M:     Tuomas Tynkkynen tuomas.tynkkynen@iki.fi
+S:     Maintained
+F:     board/emulation/qemu-arm/
+F:     include/configs/qemu-arm.h
+F:     configs/qemu_arm_defconfig
diff --git a/board/emulation/qemu-arm/Makefile b/board/emulation/qemu-arm/Makefile
new file mode 100644
index 0000000000..716a6e9c28
--- /dev/null
+++ b/board/emulation/qemu-arm/Makefile
@@ -0,0 +1,5 @@
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#



+obj-y  += qemu-arm.o
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
new file mode 100644
index 0000000000..e29ba4630f
--- /dev/null
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -0,0 +1,33 @@
+/*


Copyright (c) 2017 Tuomas Tynkkynen







SPDX-License-Identifier:    GPL-2.0+


*/

+#include <common.h>
+#include <fdtdec.h>



+int board_init(void)
+{

  return 0;



+}



+int dram_init(void)
+{

  if (fdtdec_setup_memory_size() != 0)


          return -EINVAL;



  return 0;



+}



+int dram_init_banksize(void)
+{

  fdtdec_setup_memory_banksize();



  return 0;



+}



+void *board_fdt_blob_setup(void)
+{

  /* QEMU loads a generated DTB for us at the start of RAM. */



nits: remove the ending period
...

  return (void *)CONFIG_SYS_SDRAM_BASE;



+}
diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
Can we use 'qemu-arm_defconfig", to be in consistent with the board name?
Sure.

    