* [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine
2017-08-30 8:31 [U-Boot] [PATCH 0/2] Board for QEMU's '-machine virt' on ARM Tuomas Tynkkynen
@ 2017-08-30 8:31 ` Tuomas Tynkkynen
2017-08-31 6:55 ` Bin Meng
0 siblings, 1 reply; 6+ messages in thread
From: Tuomas Tynkkynen @ 2017-08-30 8:31 UTC (permalink / raw)
To: u-boot
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 enable 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 enable an Intel E1000 network adapter, pass e.g.:
-net nic,model=e1000 -net user
- To add an EHCI-compliant USB host controller, pass e.g.:
-device usb-ehci,id=ehci
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
---
arch/arm/Kconfig | 10 ++++++++
arch/arm/mach-qemu/Kconfig | 9 +++++++
board/qemu-arm/Makefile | 5 ++++
board/qemu-arm/qemu-arm.c | 35 ++++++++++++++++++++++++++
configs/qemu_arm_defconfig | 27 ++++++++++++++++++++
include/configs/qemu-arm.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 149 insertions(+)
create mode 100644 arch/arm/mach-qemu/Kconfig
create mode 100644 board/qemu-arm/Makefile
create mode 100644 board/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 53d0831935..0d01ba1b73 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
@@ -1149,6 +1157,8 @@ source "arch/arm/mach-stm32/Kconfig"
source "arch/arm/mach-sunxi/Kconfig"
+source "arch/arm/mach-qemu/Kconfig"
+
source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig"
diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig
new file mode 100644
index 0000000000..89d2a36719
--- /dev/null
+++ b/arch/arm/mach-qemu/Kconfig
@@ -0,0 +1,9 @@
+if ARCH_QEMU
+
+config SYS_BOARD
+ default "qemu-arm"
+
+config SYS_CONFIG_NAME
+ default "qemu-arm"
+
+endif
diff --git a/board/qemu-arm/Makefile b/board/qemu-arm/Makefile
new file mode 100644
index 0000000000..3e9907d983
--- /dev/null
+++ b/board/qemu-arm/Makefile
@@ -0,0 +1,5 @@
+#
+# SPDX-License-Identifier: GPL-2.0
+#
+
+obj-y += qemu-arm.o
diff --git a/board/qemu-arm/qemu-arm.c b/board/qemu-arm/qemu-arm.c
new file mode 100644
index 0000000000..90d7badbf4
--- /dev/null
+++ b/board/qemu-arm/qemu-arm.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017 Tuomas Tynkkynen
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#include <common.h>
+#include <fdtdec.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+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. */
+ return (void *)CONFIG_SYS_SDRAM_BASE;
+}
diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
new file mode 100644
index 0000000000..d34512dd0d
--- /dev/null
+++ b/configs/qemu_arm_defconfig
@@ -0,0 +1,27 @@
+CONFIG_ARM=y
+CONFIG_ARM_SMCCC=y
+CONFIG_ARCH_QEMU=y
+CONFIG_AHCI=y
+CONFIG_DISTRO_DEFAULTS=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_OF_BOARD=y
+CONFIG_AHCI_PCI=y
+CONFIG_BLK=y
+# CONFIG_MMC is not set
+CONFIG_DM_ETH=y
+CONFIG_E1000=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PCIE_ECAM_GENERIC=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_PSCI=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_PCI=y
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
new file mode 100644
index 0000000000..2bcc0efad0
--- /dev/null
+++ b/include/configs/qemu-arm.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017 Tuomas Tynkkynen
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <linux/sizes.h>
+
+/* Physical memory map */
+#define CONFIG_SYS_TEXT_BASE 0x00000000
+
+#define CONFIG_NR_DRAM_BANKS 1
+#define CONFIG_SYS_SDRAM_BASE 0x40000000
+
+/* The DTB generated by QEMU is placed at start of RAM, stay away from there */
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M)
+#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M)
+#define CONFIG_SYS_MALLOC_LEN SZ_16M
+
+/* QEMU's PL011 serial port is detected via FDT using the device model */
+#define CONFIG_PL01X_SERIAL
+
+/* QEMU implements a 62.5MHz architected timer */
+/* FIXME: can we rely on CNTFREQ instead of hardcoding this fact here? */
+#define CONFIG_SYS_ARCH_TIMER
+#define CONFIG_SYS_HZ 1000
+#define CONFIG_SYS_HZ_CLOCK 62500000
+
+/* Command prompt options */
+#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
+ sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_MAXARGS 64 /* max command args */
+
+/* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID 8
+#define CONFIG_SCSI_AHCI
+#define CONFIG_LIBATA
+
+/* Environment options */
+#define CONFIG_ENV_SIZE SZ_64K
+
+#include <config_distro_defaults.h>
+
+#define BOOT_TARGET_DEVICES(func) \
+ func(SCSI, scsi, 0)
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_PREBOOT "pci enum"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "fdt_addr=0x40000000\0" \
+ "scriptaddr=0x40200000\0" \
+ "pxefile_addr_r=0x40300000\0" \
+ "kernel_addr_r=0x40400000\0" \
+ "ramdisk_addr_r=0x44000000\0" \
+ BOOTENV
+
+#endif /* __CONFIG_H */
--
2.13.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine
2017-08-30 8:31 ` [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine Tuomas Tynkkynen
@ 2017-08-31 6:55 ` Bin Meng
2017-08-31 21:56 ` Tuomas Tynkkynen
0 siblings, 1 reply; 6+ messages in thread
From: Bin Meng @ 2017-08-31 6:55 UTC (permalink / raw)
To: u-boot
Hi Tuomas,
On Wed, Aug 30, 2017 at 4:31 PM, 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 enable 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 enable an Intel E1000 network adapter, pass e.g.:
> -net nic,model=e1000 -net user
> - To add an EHCI-compliant USB host controller, pass e.g.:
> -device usb-ehci,id=ehci
Can we enable the NVMe driver (CONFIG_NVME) here?
>
> Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
> ---
> arch/arm/Kconfig | 10 ++++++++
> arch/arm/mach-qemu/Kconfig | 9 +++++++
> board/qemu-arm/Makefile | 5 ++++
> board/qemu-arm/qemu-arm.c | 35 ++++++++++++++++++++++++++
> configs/qemu_arm_defconfig | 27 ++++++++++++++++++++
> include/configs/qemu-arm.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++
> 6 files changed, 149 insertions(+)
> create mode 100644 arch/arm/mach-qemu/Kconfig
> create mode 100644 board/qemu-arm/Makefile
> create mode 100644 board/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 53d0831935..0d01ba1b73 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
> @@ -1149,6 +1157,8 @@ source "arch/arm/mach-stm32/Kconfig"
>
> source "arch/arm/mach-sunxi/Kconfig"
>
> +source "arch/arm/mach-qemu/Kconfig"
> +
Can you insert this by following alphabetical order?
> source "arch/arm/mach-tegra/Kconfig"
>
> source "arch/arm/mach-uniphier/Kconfig"
> diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig
> new file mode 100644
> index 0000000000..89d2a36719
> --- /dev/null
> +++ b/arch/arm/mach-qemu/Kconfig
> @@ -0,0 +1,9 @@
> +if ARCH_QEMU
> +
> +config SYS_BOARD
> + default "qemu-arm"
> +
> +config SYS_CONFIG_NAME
> + default "qemu-arm"
> +
> +endif
> diff --git a/board/qemu-arm/Makefile b/board/qemu-arm/Makefile
> new file mode 100644
> index 0000000000..3e9907d983
> --- /dev/null
> +++ b/board/qemu-arm/Makefile
Can this new board be put into the board/emulation/qemu-arm directory?
Since qemu-x86 is put there.
> @@ -0,0 +1,5 @@
> +#
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +
> +obj-y += qemu-arm.o
> diff --git a/board/qemu-arm/qemu-arm.c b/board/qemu-arm/qemu-arm.c
> new file mode 100644
> index 0000000000..90d7badbf4
> --- /dev/null
> +++ b/board/qemu-arm/qemu-arm.c
> @@ -0,0 +1,35 @@
> +/*
> + * Copyright (c) 2017 Tuomas Tynkkynen
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +#include <common.h>
> +#include <fdtdec.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
This is not needed as gd is not referenced in this file.
> +
> +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. */
> + return (void *)CONFIG_SYS_SDRAM_BASE;
> +}
> diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
> new file mode 100644
> index 0000000000..d34512dd0d
> --- /dev/null
> +++ b/configs/qemu_arm_defconfig
> @@ -0,0 +1,27 @@
> +CONFIG_ARM=y
> +CONFIG_ARM_SMCCC=y
> +CONFIG_ARCH_QEMU=y
> +CONFIG_AHCI=y
> +CONFIG_DISTRO_DEFAULTS=y
> +# CONFIG_DISPLAY_CPUINFO is not set
> +# CONFIG_DISPLAY_BOARDINFO is not set
> +# CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_PCI=y
> +CONFIG_CMD_USB=y
> +CONFIG_OF_BOARD=y
> +CONFIG_AHCI_PCI=y
> +CONFIG_BLK=y
> +# CONFIG_MMC is not set
> +CONFIG_DM_ETH=y
> +CONFIG_E1000=y
> +CONFIG_PCI=y
> +CONFIG_DM_PCI=y
> +CONFIG_PCIE_ECAM_GENERIC=y
> +CONFIG_SCSI=y
> +CONFIG_DM_SCSI=y
> +CONFIG_SYSRESET=y
> +CONFIG_SYSRESET_PSCI=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_PCI=y
> diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
> new file mode 100644
> index 0000000000..2bcc0efad0
> --- /dev/null
> +++ b/include/configs/qemu-arm.h
> @@ -0,0 +1,63 @@
> +/*
> + * Copyright (c) 2017 Tuomas Tynkkynen
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#ifndef __CONFIG_H
> +#define __CONFIG_H
> +
> +#include <linux/sizes.h>
> +
> +/* Physical memory map */
> +#define CONFIG_SYS_TEXT_BASE 0x00000000
> +
> +#define CONFIG_NR_DRAM_BANKS 1
> +#define CONFIG_SYS_SDRAM_BASE 0x40000000
> +
> +/* The DTB generated by QEMU is placed at start of RAM, stay away from there */
> +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M)
> +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M)
> +#define CONFIG_SYS_MALLOC_LEN SZ_16M
> +
> +/* QEMU's PL011 serial port is detected via FDT using the device model */
> +#define CONFIG_PL01X_SERIAL
> +
> +/* QEMU implements a 62.5MHz architected timer */
> +/* FIXME: can we rely on CNTFREQ instead of hardcoding this fact here? */
> +#define CONFIG_SYS_ARCH_TIMER
> +#define CONFIG_SYS_HZ 1000
> +#define CONFIG_SYS_HZ_CLOCK 62500000
> +
> +/* Command prompt options */
> +#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
> +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
> + sizeof(CONFIG_SYS_PROMPT) + 16)
> +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
> +#define CONFIG_SYS_MAXARGS 64 /* max command args */
> +
> +/* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
> +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 8
> +#define CONFIG_SCSI_AHCI
> +#define CONFIG_LIBATA
> +
> +/* Environment options */
> +#define CONFIG_ENV_SIZE SZ_64K
> +
> +#include <config_distro_defaults.h>
> +
> +#define BOOT_TARGET_DEVICES(func) \
> + func(SCSI, scsi, 0)
> +
> +#include <config_distro_bootcmd.h>
> +
> +#define CONFIG_PREBOOT "pci enum"
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> + "fdt_addr=0x40000000\0" \
> + "scriptaddr=0x40200000\0" \
> + "pxefile_addr_r=0x40300000\0" \
> + "kernel_addr_r=0x40400000\0" \
> + "ramdisk_addr_r=0x44000000\0" \
> + BOOTENV
> +
> +#endif /* __CONFIG_H */
> --
Regards,
Bin
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine
2017-08-31 6:55 ` Bin Meng
@ 2017-08-31 21:56 ` Tuomas Tynkkynen
2017-09-01 3:07 ` Bin Meng
0 siblings, 1 reply; 6+ messages in thread
From: Tuomas Tynkkynen @ 2017-08-31 21:56 UTC (permalink / raw)
To: u-boot
Hi,
On 08/31/2017 09:55 AM, Bin Meng wrote:
> Hi Tuomas,
>
> On Wed, Aug 30, 2017 at 4:31 PM, 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 enable 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 enable an Intel E1000 network adapter, pass e.g.:
>> -net nic,model=e1000 -net user
>> - To add an EHCI-compliant USB host controller, pass e.g.:
>> -device usb-ehci,id=ehci
>
> Can we enable the NVMe driver (CONFIG_NVME) here?
>
Yes, 'nvme scan' and 'nvme list' it appear to work. I'll enable it.
There is a bunch of spew of this form though:
CACHE: Misaligned operation at range [bef5d000, bef5d020]
>>
>> Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
>> ---
>> arch/arm/Kconfig | 10 ++++++++
>> arch/arm/mach-qemu/Kconfig | 9 +++++++
>> board/qemu-arm/Makefile | 5 ++++
>> board/qemu-arm/qemu-arm.c | 35 ++++++++++++++++++++++++++
>> configs/qemu_arm_defconfig | 27 ++++++++++++++++++++
>> include/configs/qemu-arm.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++
>> 6 files changed, 149 insertions(+)
>> create mode 100644 arch/arm/mach-qemu/Kconfig
>> create mode 100644 board/qemu-arm/Makefile
>> create mode 100644 board/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 53d0831935..0d01ba1b73 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
>> @@ -1149,6 +1157,8 @@ source "arch/arm/mach-stm32/Kconfig"
>>
>> source "arch/arm/mach-sunxi/Kconfig"
>>
>> +source "arch/arm/mach-qemu/Kconfig"
>> +
>
> Can you insert this by following alphabetical order?
>
Oops, yes of course.
>> source "arch/arm/mach-tegra/Kconfig"
>>
>> source "arch/arm/mach-uniphier/Kconfig"
>> diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig
>> new file mode 100644
>> index 0000000000..89d2a36719
>> --- /dev/null
>> +++ b/arch/arm/mach-qemu/Kconfig
>> @@ -0,0 +1,9 @@
>> +if ARCH_QEMU
>> +
>> +config SYS_BOARD
>> + default "qemu-arm"
>> +
>> +config SYS_CONFIG_NAME
>> + default "qemu-arm"
>> +
>> +endif
>> diff --git a/board/qemu-arm/Makefile b/board/qemu-arm/Makefile
>> new file mode 100644
>> index 0000000000..3e9907d983
>> --- /dev/null
>> +++ b/board/qemu-arm/Makefile
>
> Can this new board be put into the board/emulation/qemu-arm directory?
> Since qemu-x86 is put there.
>
Sure. There is still qemu-mips directly under board/ though.
>> @@ -0,0 +1,5 @@
>> +#
>> +# SPDX-License-Identifier: GPL-2.0
>> +#
>> +
>> +obj-y += qemu-arm.o
>> diff --git a/board/qemu-arm/qemu-arm.c b/board/qemu-arm/qemu-arm.c
>> new file mode 100644
>> index 0000000000..90d7badbf4
>> --- /dev/null
>> +++ b/board/qemu-arm/qemu-arm.c
>> @@ -0,0 +1,35 @@
>> +/*
>> + * Copyright (c) 2017 Tuomas Tynkkynen
>> + *
>> + * SPDX-License-Identifier: GPL-2.0+
>> + */
>> +#include <common.h>
>> +#include <fdtdec.h>
>> +
>> +DECLARE_GLOBAL_DATA_PTR;
>
> This is not needed as gd is not referenced in this file.
>
Now removed.
Thank you for the review.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine
2017-08-31 21:56 ` Tuomas Tynkkynen
@ 2017-09-01 3:07 ` Bin Meng
0 siblings, 0 replies; 6+ messages in thread
From: Bin Meng @ 2017-09-01 3:07 UTC (permalink / raw)
To: u-boot
Hi Tuomas,
On Fri, Sep 1, 2017 at 5:56 AM, Tuomas Tynkkynen <dezgeg@gmail.com> wrote:
> Hi,
>
>
> On 08/31/2017 09:55 AM, Bin Meng wrote:
>>
>> Hi Tuomas,
>>
>> On Wed, Aug 30, 2017 at 4:31 PM, 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 enable 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 enable an Intel E1000 network adapter, pass e.g.:
>>> -net nic,model=e1000 -net user
>>> - To add an EHCI-compliant USB host controller, pass e.g.:
>>> -device usb-ehci,id=ehci
>>
>>
>> Can we enable the NVMe driver (CONFIG_NVME) here?
>>
>
> Yes, 'nvme scan' and 'nvme list' it appear to work. I'll enable it.
> There is a bunch of spew of this form though:
>
> CACHE: Misaligned operation at range [bef5d000, bef5d020]
>
I think I've fixed this already and is now in v2017.09-rc3. But rc3 is
still not shown on git.denx.de. Not sure why.
>
>
>>>
>>> Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
>>> ---
>>> arch/arm/Kconfig | 10 ++++++++
>>> arch/arm/mach-qemu/Kconfig | 9 +++++++
>>> board/qemu-arm/Makefile | 5 ++++
>>> board/qemu-arm/qemu-arm.c | 35 ++++++++++++++++++++++++++
>>> configs/qemu_arm_defconfig | 27 ++++++++++++++++++++
>>> include/configs/qemu-arm.h | 63
>>> ++++++++++++++++++++++++++++++++++++++++++++++
>>> 6 files changed, 149 insertions(+)
>>> create mode 100644 arch/arm/mach-qemu/Kconfig
>>> create mode 100644 board/qemu-arm/Makefile
>>> create mode 100644 board/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 53d0831935..0d01ba1b73 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
>>> @@ -1149,6 +1157,8 @@ source "arch/arm/mach-stm32/Kconfig"
>>>
>>> source "arch/arm/mach-sunxi/Kconfig"
>>>
>>> +source "arch/arm/mach-qemu/Kconfig"
>>> +
>>
>>
>> Can you insert this by following alphabetical order?
>>
>
> Oops, yes of course.
>
>>> source "arch/arm/mach-tegra/Kconfig"
>>>
>>> source "arch/arm/mach-uniphier/Kconfig"
>>> diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig
>>> new file mode 100644
>>> index 0000000000..89d2a36719
>>> --- /dev/null
>>> +++ b/arch/arm/mach-qemu/Kconfig
>>> @@ -0,0 +1,9 @@
>>> +if ARCH_QEMU
>>> +
>>> +config SYS_BOARD
>>> + default "qemu-arm"
>>> +
>>> +config SYS_CONFIG_NAME
>>> + default "qemu-arm"
>>> +
>>> +endif
>>> diff --git a/board/qemu-arm/Makefile b/board/qemu-arm/Makefile
>>> new file mode 100644
>>> index 0000000000..3e9907d983
>>> --- /dev/null
>>> +++ b/board/qemu-arm/Makefile
>>
>>
>> Can this new board be put into the board/emulation/qemu-arm directory?
>> Since qemu-x86 is put there.
>>
>
> Sure. There is still qemu-mips directly under board/ though.
Yep, so a separate patch to move all these qemu- boards into emulation
would be nice.
>
>>> @@ -0,0 +1,5 @@
>>> +#
>>> +# SPDX-License-Identifier: GPL-2.0
>>> +#
>>> +
>>> +obj-y += qemu-arm.o
>>> diff --git a/board/qemu-arm/qemu-arm.c b/board/qemu-arm/qemu-arm.c
>>> new file mode 100644
>>> index 0000000000..90d7badbf4
>>> --- /dev/null
>>> +++ b/board/qemu-arm/qemu-arm.c
>>> @@ -0,0 +1,35 @@
>>> +/*
>>> + * Copyright (c) 2017 Tuomas Tynkkynen
>>> + *
>>> + * SPDX-License-Identifier: GPL-2.0+
>>> + */
>>> +#include <common.h>
>>> +#include <fdtdec.h>
>>> +
>>> +DECLARE_GLOBAL_DATA_PTR;
>>
>>
>> This is not needed as gd is not referenced in this file.
>>
>
> Now removed.
>
> Thank you for the review.
Regards,
Bin
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine
@ 2018-05-09 10:56 Paulo Neves
2018-05-14 23:47 ` Tuomas Tynkkynen
0 siblings, 1 reply; 6+ messages in thread
From: Paulo Neves @ 2018-05-09 10:56 UTC (permalink / raw)
To: u-boot
Hello I have successfully built u-boot and launched qemu with the
flags proposed by the patch. My problems start when I try to boot the
kernel
What is the linux kernel defconfig that should be used to boot this
machine? I tried the versatile one but they are different in some key
places like the sd card. The end result is that I can only see
Starting Kernel, and nothing else. What bootargs do you pass to the
kernel to have the serial output in qemu?
Paulo Neves
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine
2018-05-09 10:56 [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine Paulo Neves
@ 2018-05-14 23:47 ` Tuomas Tynkkynen
0 siblings, 0 replies; 6+ messages in thread
From: Tuomas Tynkkynen @ 2018-05-14 23:47 UTC (permalink / raw)
To: u-boot
Hi,
On Wed, 9 May 2018 12:56:46 +0200
Paulo Neves <ptsneves@gmail.com> wrote:
> Hello I have successfully built u-boot and launched qemu with the
> flags proposed by the patch. My problems start when I try to boot the
> kernel
>
> What is the linux kernel defconfig that should be used to boot this
> machine?
multi_v7_defconfig does work at least.
> I tried the versatile one but they are different in some key
> places like the sd card. The end result is that I can only see
> Starting Kernel, and nothing else. What bootargs do you pass to the
> kernel to have the serial output in qemu?
The serial port in Linux is ttyAMA0. But I think it works without any
console= specified as well, because the QEMU-generated dtb specifies
/chosen/stdout-path already pointing to that serial port.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-14 23:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-09 10:56 [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine Paulo Neves
2018-05-14 23:47 ` Tuomas Tynkkynen
-- strict thread matches above, loose matches on Subject: below --
2017-08-30 8:31 [U-Boot] [PATCH 0/2] Board for QEMU's '-machine virt' on ARM Tuomas Tynkkynen
2017-08-30 8:31 ` [U-Boot] [PATCH 2/2] ARM: Add a new arch + board for QEMU's 'virt' machine Tuomas Tynkkynen
2017-08-31 6:55 ` Bin Meng
2017-08-31 21:56 ` Tuomas Tynkkynen
2017-09-01 3:07 ` Bin Meng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox