From patchwork Mon Mar 9 21:58:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 11428149 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8824D921 for ; Mon, 9 Mar 2020 22:01:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D9D52253D for ; Mon, 9 Mar 2020 22:01:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kbLskNbB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D9D52253D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQSM-00074D-Hw for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Mar 2020 18:01:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46791) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQPo-0003AD-Ak for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBQPn-0005cv-9i for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:24 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:53676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBQPn-0005c6-3n for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:23 -0400 Received: by mail-wm1-x330.google.com with SMTP id g134so1192898wme.3 for ; Mon, 09 Mar 2020 14:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/bWoXSuiIZ/NdLhIJtlxSIZm8FTmVmD4iHSdiTEX+nU=; b=kbLskNbBt81qwQ0rt5iCUgsOj1dftPLGLlKH7JDY5M3PY2XCEVjcIcby8hg0bF8pz0 OuqpG/1+w2bi7q1Qqu3jYDh3GSR51C3X1+3AigOo4IQ2SXtNaxAKIiyXoRBkrSvECatK ac7WVUBOrEt0NQRX7HXPNQyUuBBhXF3wR5smEdUYOVWPNbx9yXsWXQqzpYt8ukY3hMxR raX+w+nWW4k0MbpvFiGtgJ4EkjIiiAf6htNmn29Im/tvspuCoVk5wrESSkO12X1XxNzZ a8JZPye+CbUajAokz1mrLfLX9HPDBzkx3Erv1oXAUlxCwu2uhxFg5SfefBVh7PE0vIaV Rkww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/bWoXSuiIZ/NdLhIJtlxSIZm8FTmVmD4iHSdiTEX+nU=; b=FqugKlgU//InIMMT68g6KY4WPMMpe4vOZY2jOmC4o8M1BRcvu9CajZZpn9sFQ08SNR uqeTRgy4eOn8tcgAYN69zQArlv8Fkf9pmmIsJ5q3TRnC/l51HlF2c77PcE+/T9tc9BMU TnirLShsYvl9VgEhVWqdLK6f5436kq8rIeXOl7UsBu82pzRAozyZ8cnfWMAOorw2rZgt 2ZGe++wvP0WgFdQ5iQD0tn/LRwVvQTpzcuGGgQKmMsyZgv7UkAUhhS17YybQg6shB0fd O+0qE4jYRiujcCTUAZaOAGKXyjV0i3FmiMDtWuL0Rq5Dy6Mo+8syOluKfV+Ly2Q9GoNz tz/g== X-Gm-Message-State: ANhLgQ3iDqJd/V96VO89IScUblvqLABd9vOcoGV3zM85SrlO9MSB6C6Q ISIkQmfkDOWQqycjl6jQAxS44AbtEzx/mg== X-Google-Smtp-Source: ADFU+vvVKvvvwbx/2iNf0hqzBS5GPs4/Z2n6V1B9vzn2seOSCP08AhbYsgyUe2Ri5eD1nw0nZJVROg== X-Received: by 2002:a1c:7f8e:: with SMTP id a136mr1212979wmd.143.1583791102149; Mon, 09 Mar 2020 14:58:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm42207068wrm.3.2020.03.09.14.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 14:58:21 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/5] Makefile: Allow for subdirectories in Sphinx manual dependencies Date: Mon, 9 Mar 2020 21:58:14 +0000 Message-Id: <20200309215818.2021-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200309215818.2021-1-peter.maydell@linaro.org> References: <20200309215818.2021-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Niek Linnenbank Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Currently we put 'docs/foo/*.rst' in the Make list of dependencies for the Sphinx 'foo' manual, which means all the files must be in the top level of that manual's directory. We'd like to be able to have subdirectories inside some of the manuals, so add 'docs/foo/*/*.rst' to the dependencies too. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Niek Linnenbank Reviewed-by: Richard Henderson --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2e930688942..5dba949947a 100644 --- a/Makefile +++ b/Makefile @@ -1081,7 +1081,7 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ # a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946 build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) -W -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1") # We assume all RST files in the manual's directory are used in it -manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) \ +manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*/*.rst) \ $(SRC_PATH)/docs/defs.rst.inc \ $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py # Macro to write out the rule and dependencies for building manpages From patchwork Mon Mar 9 21:58:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 11428151 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4221A921 for ; Mon, 9 Mar 2020 22:01:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07CDF2253D for ; Mon, 9 Mar 2020 22:01:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="My/OwpMu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07CDF2253D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQT5-0007a0-6w for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Mar 2020 18:01:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQPs-0003EW-58 for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBQPp-0005eu-72 for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:28 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBQPo-0005dZ-U4 for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:25 -0400 Received: by mail-wr1-x42c.google.com with SMTP id v9so13168145wrf.10 for ; Mon, 09 Mar 2020 14:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+vjVmnqPRp7rL/1/5NOoN6gdhvO2Xo8IvhqKhP4WSw8=; b=My/OwpMuA0avYq3xiHNi3BwiSfdY4Aa5Z9SmiEnc4LvTDltETtom9v16Bhzk9gCC04 iT3eERpcoqYyA+Oc2UqN3xHVDbWLLXOnkPfNrcIZm166v/5E5XKeini5RyYoXVD/uZed h6d+uvFD3iFx6e+k1gCHeMXO1vprKUw3m3LNDhU+gFWpn4BqbWq63dz9XH7EdxnQ9VDH 5WW0yhmI2r/0tJ5Rka9gKXmIA1SwAw+MBKfnGMMAUrEHAdWOEjFZkXi8lW9tpqwzPSJK gDlf2IppLkXYa5NTSMOkCUIW/6oBNQ/t9fjOp5t5SX0ZLGBUcY/7Ffv4yTricUwBDAWU JHqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+vjVmnqPRp7rL/1/5NOoN6gdhvO2Xo8IvhqKhP4WSw8=; b=ZygWGHtywfE2XyhmwftFh7mxy+Kzug7KGgx/mj9tFl4hLI5Ezaew+SNnGefddx3xhB pRXDU9lE5IA7xThQTHQC4hS1e4jOkgdRdVgD3iRFFEmzUAxdyVULyRZW8d2Blvne/JFV 0ibOn808Y18YZNmo5j/HX0PAV3pdvMFcGcuM98eCjcil6xdzETkayXBK4g7UqsQ7973K Hv+HP9wTzGdYLIz1GMJMjMeXxPV0WTH6pEDuUoc0MJ67JSRsrX3itVGP8hMYbQSs5TOT qgyjkz4aUAzPO1vTYhmEydbvJzr/3TVJtcU5luOqtVi2kbM/1a8vBtuRgKpgGXfvbNjv g83g== X-Gm-Message-State: ANhLgQ1cMLC9UTphsZ3KXZGm5fBMQSvsyAcJNkEem7MteFJzHdP1Jr8D gsjh8WypOOraf1jfE9GAjiyZwhne2gzt3A== X-Google-Smtp-Source: ADFU+vtxFKzDKDph+okctGCQ+dpRR2SLyWKqg0/e35+Ypoq2QVsuFyVnYIcUuXPosX2q23jpUJApdw== X-Received: by 2002:adf:f74b:: with SMTP id z11mr8835122wrp.124.1583791103566; Mon, 09 Mar 2020 14:58:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm42207068wrm.3.2020.03.09.14.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 14:58:23 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/5] docs/system: Split target-arm.rst into sub-documents Date: Mon, 9 Mar 2020 21:58:15 +0000 Message-Id: <20200309215818.2021-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200309215818.2021-1-peter.maydell@linaro.org> References: <20200309215818.2021-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Niek Linnenbank Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Currently the documentation for Arm system emulator targets is in a single target-arm.rst. This describes only some of the boards and often in a fairly abbreviated fashion. Restructure it so that each board has its own documentation file in the docs/system/arm/ subdirectory. This will hopefully encourage us to write board documentation that describes the board in detail, rather than a few brief paragraphs in a single long page. The table of contents should also help users to find the board they care about faster. Once the structure is in place we'll be able to move microvm.rst from the top-level docs/ directory. All the text from the old page is retained, except for the final paragraph ("A Linux 2.6 test image is available on the QEMU web site. More information is available in the QEMU mailing-list archive."), which is deleted. The git history shows this was originally added in reference to the integratorcp board (at that time the only Arm board that was supported), and has subsequently gradually been further and further separated from the integratorcp documentation by the insertion of other board documentation sections. It's extremely out of date and no longer accurate, since AFAICT there isn't an integratorcp kernel on the website any more; so better deleted than retained. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Niek Linnenbank --- A subsequent patch will add some text that at least gestures in the direction of some of the more obvious missing info, eg 64-bit boards. --- MAINTAINERS | 9 ++ docs/system/arm/integratorcp.rst | 16 +++ docs/system/arm/musicpal.rst | 19 +++ docs/system/arm/nseries.rst | 33 +++++ docs/system/arm/palm.rst | 23 ++++ docs/system/arm/realview.rst | 34 +++++ docs/system/arm/stellaris.rst | 26 ++++ docs/system/arm/sx1.rst | 18 +++ docs/system/arm/versatile.rst | 29 ++++ docs/system/arm/xscale.rst | 29 ++++ docs/system/target-arm.rst | 225 ++----------------------------- 11 files changed, 249 insertions(+), 212 deletions(-) create mode 100644 docs/system/arm/integratorcp.rst create mode 100644 docs/system/arm/musicpal.rst create mode 100644 docs/system/arm/nseries.rst create mode 100644 docs/system/arm/palm.rst create mode 100644 docs/system/arm/realview.rst create mode 100644 docs/system/arm/stellaris.rst create mode 100644 docs/system/arm/sx1.rst create mode 100644 docs/system/arm/versatile.rst create mode 100644 docs/system/arm/xscale.rst diff --git a/MAINTAINERS b/MAINTAINERS index 36d0c6887a9..31a1b423df1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -155,6 +155,7 @@ F: include/hw/cpu/a*mpcore.h F: disas/arm.c F: disas/arm-a64.cc F: disas/libvixl/ +F: docs/system/target-arm.rst ARM SMMU M: Eric Auger @@ -615,6 +616,7 @@ F: hw/arm/integratorcp.c F: hw/misc/arm_integrator_debug.c F: include/hw/misc/arm_integrator_debug.h F: tests/acceptance/machine_arm_integratorcp.py +F: docs/system/arm/integratorcp.rst MCIMX6UL EVK / i.MX6ul M: Peter Maydell @@ -673,6 +675,7 @@ M: Peter Maydell L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/musicpal.c +F: docs/system/arm/musicpal.rst nSeries M: Andrzej Zaborowski @@ -689,6 +692,7 @@ F: include/hw/display/blizzard.h F: include/hw/input/tsc2xxx.h F: include/hw/misc/cbus.h F: tests/acceptance/machine_arm_n8x0.py +F: docs/system/arm/nseries.rst Palm M: Andrzej Zaborowski @@ -698,6 +702,7 @@ S: Odd Fixes F: hw/arm/palm.c F: hw/input/tsc210x.c F: include/hw/input/tsc2xxx.h +F: docs/system/arm/palm.rst Raspberry Pi M: Peter Maydell @@ -719,6 +724,7 @@ F: hw/arm/realview* F: hw/cpu/realview_mpcore.c F: hw/intc/realview_gic.c F: include/hw/intc/realview_gic.h +F: docs/system/arm/realview.rst PXA2XX M: Andrzej Zaborowski @@ -738,6 +744,7 @@ F: hw/misc/max111x.c F: include/hw/arm/pxa.h F: include/hw/arm/sharpsl.h F: include/hw/display/tc6393xb.h +F: docs/system/arm/xscale.rst SABRELITE / i.MX6 M: Peter Maydell @@ -773,6 +780,7 @@ L: qemu-arm@nongnu.org S: Maintained F: hw/*/stellaris* F: include/hw/input/gamepad.h +F: docs/system/arm/stellaris.rst Versatile Express M: Peter Maydell @@ -786,6 +794,7 @@ L: qemu-arm@nongnu.org S: Maintained F: hw/*/versatile* F: hw/misc/arm_sysctl.c +F: docs/system/arm/versatile.rst Virt M: Peter Maydell diff --git a/docs/system/arm/integratorcp.rst b/docs/system/arm/integratorcp.rst new file mode 100644 index 00000000000..3232b43a08b --- /dev/null +++ b/docs/system/arm/integratorcp.rst @@ -0,0 +1,16 @@ +Integrator/CP (``integratorcp``) +================================ + +The ARM Integrator/CP board is emulated with the following devices: + +- ARM926E, ARM1026E, ARM946E, ARM1136 or Cortex-A8 CPU + +- Two PL011 UARTs + +- SMC 91c111 Ethernet adapter + +- PL110 LCD controller + +- PL050 KMI with PS/2 keyboard and mouse. + +- PL181 MultiMedia Card Interface with SD card. diff --git a/docs/system/arm/musicpal.rst b/docs/system/arm/musicpal.rst new file mode 100644 index 00000000000..35c22212486 --- /dev/null +++ b/docs/system/arm/musicpal.rst @@ -0,0 +1,19 @@ +Freecom MusicPal (``musicpal``) +=============================== + +The Freecom MusicPal internet radio emulation includes the following +elements: + +- Marvell MV88W8618 ARM core. + +- 32 MB RAM, 256 KB SRAM, 8 MB flash. + +- Up to 2 16550 UARTs + +- MV88W8xx8 Ethernet controller + +- MV88W8618 audio controller, WM8750 CODEC and mixer + +- 128x64 display with brightness control + +- 2 buttons, 2 navigation wheels with button function diff --git a/docs/system/arm/nseries.rst b/docs/system/arm/nseries.rst new file mode 100644 index 00000000000..b000b6d13bb --- /dev/null +++ b/docs/system/arm/nseries.rst @@ -0,0 +1,33 @@ +Nokia N800 and N810 tablets (``n800``, ``n810``) +================================================ + +Nokia N800 and N810 internet tablets (known also as RX-34 and RX-44 / +48) emulation supports the following elements: + +- Texas Instruments OMAP2420 System-on-chip (ARM 1136 core) + +- RAM and non-volatile OneNAND Flash memories + +- Display connected to EPSON remote framebuffer chip and OMAP on-chip + display controller and a LS041y3 MIPI DBI-C controller + +- TI TSC2301 (in N800) and TI TSC2005 (in N810) touchscreen + controllers driven through SPI bus + +- National Semiconductor LM8323-controlled qwerty keyboard driven + through |I2C| bus + +- Secure Digital card connected to OMAP MMC/SD host + +- Three OMAP on-chip UARTs and on-chip STI debugging console + +- Mentor Graphics \"Inventra\" dual-role USB controller embedded in a + TI TUSB6010 chip - only USB host mode is supported + +- TI TMP105 temperature sensor driven through |I2C| bus + +- TI TWL92230C power management companion with an RTC on + |I2C| bus + +- Nokia RETU and TAHVO multi-purpose chips with an RTC, connected + through CBUS diff --git a/docs/system/arm/palm.rst b/docs/system/arm/palm.rst new file mode 100644 index 00000000000..0eabf63e0e7 --- /dev/null +++ b/docs/system/arm/palm.rst @@ -0,0 +1,23 @@ +Palm Tungsten|E PDA (``cheetah``) +================================= + +The Palm Tungsten|E PDA (codename \"Cheetah\") emulation includes the +following elements: + +- Texas Instruments OMAP310 System-on-chip (ARM 925T core) + +- ROM and RAM memories (ROM firmware image can be loaded with + -option-rom) + +- On-chip LCD controller + +- On-chip Real Time Clock + +- TI TSC2102i touchscreen controller / analog-digital converter / + Audio CODEC, connected through MicroWire and |I2S| busses + +- GPIO-connected matrix keypad + +- Secure Digital card connected to OMAP MMC/SD host + +- Three on-chip UARTs diff --git a/docs/system/arm/realview.rst b/docs/system/arm/realview.rst new file mode 100644 index 00000000000..8e08eb5da16 --- /dev/null +++ b/docs/system/arm/realview.rst @@ -0,0 +1,34 @@ +Arm Realview boards (``realview-eb``, ``realview-eb-mpcore``, ``realview-pb-a8``, ``realview-pbx-a9``) +====================================================================================================== + +Several variants of the ARM RealView baseboard are emulated, including +the EB, PB-A8 and PBX-A9. Due to interactions with the bootloader, only +certain Linux kernel configurations work out of the box on these boards. + +Kernels for the PB-A8 board should have CONFIG_REALVIEW_HIGH_PHYS_OFFSET +enabled in the kernel, and expect 512M RAM. Kernels for The PBX-A9 board +should have CONFIG_SPARSEMEM enabled, CONFIG_REALVIEW_HIGH_PHYS_OFFSET +disabled and expect 1024M RAM. + +The following devices are emulated: + +- ARM926E, ARM1136, ARM11MPCore, Cortex-A8 or Cortex-A9 MPCore CPU + +- ARM AMBA Generic/Distributed Interrupt Controller + +- Four PL011 UARTs + +- SMC 91c111 or SMSC LAN9118 Ethernet adapter + +- PL110 LCD controller + +- PL050 KMI with PS/2 keyboard and mouse + +- PCI host bridge + +- PCI OHCI USB controller + +- LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM + devices + +- PL181 MultiMedia Card Interface with SD card. diff --git a/docs/system/arm/stellaris.rst b/docs/system/arm/stellaris.rst new file mode 100644 index 00000000000..8af4ad79c79 --- /dev/null +++ b/docs/system/arm/stellaris.rst @@ -0,0 +1,26 @@ +Stellaris boards (``lm3s6965evb``, ``lm3s811evb``) +================================================== + +The Luminary Micro Stellaris LM3S811EVB emulation includes the following +devices: + +- Cortex-M3 CPU core. + +- 64k Flash and 8k SRAM. + +- Timers, UARTs, ADC and |I2C| interface. + +- OSRAM Pictiva 96x16 OLED with SSD0303 controller on + |I2C| bus. + +The Luminary Micro Stellaris LM3S6965EVB emulation includes the +following devices: + +- Cortex-M3 CPU core. + +- 256k Flash and 64k SRAM. + +- Timers, UARTs, ADC, |I2C| and SSI interfaces. + +- OSRAM Pictiva 128x64 OLED with SSD0323 controller connected via + SSI. diff --git a/docs/system/arm/sx1.rst b/docs/system/arm/sx1.rst new file mode 100644 index 00000000000..321993bc098 --- /dev/null +++ b/docs/system/arm/sx1.rst @@ -0,0 +1,18 @@ +Siemens SX1 (``sx1``, ``sx1-v1``) +================================= + +The Siemens SX1 models v1 and v2 (default) basic emulation. The +emulation includes the following elements: + +- Texas Instruments OMAP310 System-on-chip (ARM 925T core) + +- ROM and RAM memories (ROM firmware image can be loaded with + -pflash) V1 1 Flash of 16MB and 1 Flash of 8MB V2 1 Flash of 32MB + +- On-chip LCD controller + +- On-chip Real Time Clock + +- Secure Digital card connected to OMAP MMC/SD host + +- Three on-chip UARTs diff --git a/docs/system/arm/versatile.rst b/docs/system/arm/versatile.rst new file mode 100644 index 00000000000..48b6ca0a020 --- /dev/null +++ b/docs/system/arm/versatile.rst @@ -0,0 +1,29 @@ +Arm Versatile boards (``versatileab``, ``versatilepb``) +======================================================= + +The ARM Versatile baseboard is emulated with the following devices: + +- ARM926E, ARM1136 or Cortex-A8 CPU + +- PL190 Vectored Interrupt Controller + +- Four PL011 UARTs + +- SMC 91c111 Ethernet adapter + +- PL110 LCD controller + +- PL050 KMI with PS/2 keyboard and mouse. + +- PCI host bridge. Note the emulated PCI bridge only provides access + to PCI memory space. It does not provide access to PCI IO space. This + means some devices (eg. ne2k_pci NIC) are not usable, and others (eg. + rtl8139 NIC) are only usable when the guest drivers use the memory + mapped control registers. + +- PCI OHCI USB controller. + +- LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM + devices. + +- PL181 MultiMedia Card Interface with SD card. diff --git a/docs/system/arm/xscale.rst b/docs/system/arm/xscale.rst new file mode 100644 index 00000000000..19da2eff352 --- /dev/null +++ b/docs/system/arm/xscale.rst @@ -0,0 +1,29 @@ +Sharp XScale-based PDA models (``akita``, ``borzoi``, ``spitz``, ``terrier``) +============================================================================= + +The XScale-based clamshell PDA models (\"Spitz\", \"Akita\", \"Borzoi\" +and \"Terrier\") emulation includes the following peripherals: + +- Intel PXA270 System-on-chip (ARM V5TE core) + +- NAND Flash memory + +- IBM/Hitachi DSCM microdrive in a PXA PCMCIA slot - not in \"Akita\" + +- On-chip OHCI USB controller + +- On-chip LCD controller + +- On-chip Real Time Clock + +- TI ADS7846 touchscreen controller on SSP bus + +- Maxim MAX1111 analog-digital converter on |I2C| bus + +- GPIO-connected keyboard controller and LEDs + +- Secure Digital card connected to PXA MMC/SD host + +- Three on-chip UARTs + +- WM8750 audio CODEC on |I2C| and |I2S| busses diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index d2a3b44ce88..c7df6fc1f97 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -3,215 +3,16 @@ ARM System emulator ------------------- -Use the executable ``qemu-system-arm`` to simulate a ARM machine. The -ARM Integrator/CP board is emulated with the following devices: - -- ARM926E, ARM1026E, ARM946E, ARM1136 or Cortex-A8 CPU - -- Two PL011 UARTs - -- SMC 91c111 Ethernet adapter - -- PL110 LCD controller - -- PL050 KMI with PS/2 keyboard and mouse. - -- PL181 MultiMedia Card Interface with SD card. - -The ARM Versatile baseboard is emulated with the following devices: - -- ARM926E, ARM1136 or Cortex-A8 CPU - -- PL190 Vectored Interrupt Controller - -- Four PL011 UARTs - -- SMC 91c111 Ethernet adapter - -- PL110 LCD controller - -- PL050 KMI with PS/2 keyboard and mouse. - -- PCI host bridge. Note the emulated PCI bridge only provides access - to PCI memory space. It does not provide access to PCI IO space. This - means some devices (eg. ne2k_pci NIC) are not usable, and others (eg. - rtl8139 NIC) are only usable when the guest drivers use the memory - mapped control registers. - -- PCI OHCI USB controller. - -- LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM - devices. - -- PL181 MultiMedia Card Interface with SD card. - -Several variants of the ARM RealView baseboard are emulated, including -the EB, PB-A8 and PBX-A9. Due to interactions with the bootloader, only -certain Linux kernel configurations work out of the box on these boards. - -Kernels for the PB-A8 board should have CONFIG_REALVIEW_HIGH_PHYS_OFFSET -enabled in the kernel, and expect 512M RAM. Kernels for The PBX-A9 board -should have CONFIG_SPARSEMEM enabled, CONFIG_REALVIEW_HIGH_PHYS_OFFSET -disabled and expect 1024M RAM. - -The following devices are emulated: - -- ARM926E, ARM1136, ARM11MPCore, Cortex-A8 or Cortex-A9 MPCore CPU - -- ARM AMBA Generic/Distributed Interrupt Controller - -- Four PL011 UARTs - -- SMC 91c111 or SMSC LAN9118 Ethernet adapter - -- PL110 LCD controller - -- PL050 KMI with PS/2 keyboard and mouse - -- PCI host bridge - -- PCI OHCI USB controller - -- LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM - devices - -- PL181 MultiMedia Card Interface with SD card. - -The XScale-based clamshell PDA models (\"Spitz\", \"Akita\", \"Borzoi\" -and \"Terrier\") emulation includes the following peripherals: - -- Intel PXA270 System-on-chip (ARM V5TE core) - -- NAND Flash memory - -- IBM/Hitachi DSCM microdrive in a PXA PCMCIA slot - not in \"Akita\" - -- On-chip OHCI USB controller - -- On-chip LCD controller - -- On-chip Real Time Clock - -- TI ADS7846 touchscreen controller on SSP bus - -- Maxim MAX1111 analog-digital converter on |I2C| bus - -- GPIO-connected keyboard controller and LEDs - -- Secure Digital card connected to PXA MMC/SD host - -- Three on-chip UARTs - -- WM8750 audio CODEC on |I2C| and |I2S| busses - -The Palm Tungsten|E PDA (codename \"Cheetah\") emulation includes the -following elements: - -- Texas Instruments OMAP310 System-on-chip (ARM 925T core) - -- ROM and RAM memories (ROM firmware image can be loaded with - -option-rom) - -- On-chip LCD controller - -- On-chip Real Time Clock - -- TI TSC2102i touchscreen controller / analog-digital converter / - Audio CODEC, connected through MicroWire and |I2S| busses - -- GPIO-connected matrix keypad - -- Secure Digital card connected to OMAP MMC/SD host - -- Three on-chip UARTs - -Nokia N800 and N810 internet tablets (known also as RX-34 and RX-44 / -48) emulation supports the following elements: - -- Texas Instruments OMAP2420 System-on-chip (ARM 1136 core) - -- RAM and non-volatile OneNAND Flash memories - -- Display connected to EPSON remote framebuffer chip and OMAP on-chip - display controller and a LS041y3 MIPI DBI-C controller - -- TI TSC2301 (in N800) and TI TSC2005 (in N810) touchscreen - controllers driven through SPI bus - -- National Semiconductor LM8323-controlled qwerty keyboard driven - through |I2C| bus - -- Secure Digital card connected to OMAP MMC/SD host - -- Three OMAP on-chip UARTs and on-chip STI debugging console - -- Mentor Graphics \"Inventra\" dual-role USB controller embedded in a - TI TUSB6010 chip - only USB host mode is supported - -- TI TMP105 temperature sensor driven through |I2C| bus - -- TI TWL92230C power management companion with an RTC on - |I2C| bus - -- Nokia RETU and TAHVO multi-purpose chips with an RTC, connected - through CBUS - -The Luminary Micro Stellaris LM3S811EVB emulation includes the following -devices: - -- Cortex-M3 CPU core. - -- 64k Flash and 8k SRAM. - -- Timers, UARTs, ADC and |I2C| interface. - -- OSRAM Pictiva 96x16 OLED with SSD0303 controller on - |I2C| bus. - -The Luminary Micro Stellaris LM3S6965EVB emulation includes the -following devices: - -- Cortex-M3 CPU core. - -- 256k Flash and 64k SRAM. - -- Timers, UARTs, ADC, |I2C| and SSI interfaces. - -- OSRAM Pictiva 128x64 OLED with SSD0323 controller connected via - SSI. - -The Freecom MusicPal internet radio emulation includes the following -elements: - -- Marvell MV88W8618 ARM core. - -- 32 MB RAM, 256 KB SRAM, 8 MB flash. - -- Up to 2 16550 UARTs - -- MV88W8xx8 Ethernet controller - -- MV88W8618 audio controller, WM8750 CODEC and mixer - -- 128x64 display with brightness control - -- 2 buttons, 2 navigation wheels with button function - -The Siemens SX1 models v1 and v2 (default) basic emulation. The -emulation includes the following elements: - -- Texas Instruments OMAP310 System-on-chip (ARM 925T core) - -- ROM and RAM memories (ROM firmware image can be loaded with - -pflash) V1 1 Flash of 16MB and 1 Flash of 8MB V2 1 Flash of 32MB - -- On-chip LCD controller - -- On-chip Real Time Clock - -- Secure Digital card connected to OMAP MMC/SD host - -- Three on-chip UARTs - -A Linux 2.6 test image is available on the QEMU web site. More -information is available in the QEMU mailing-list archive. +Use the executable ``qemu-system-arm`` to simulate a ARM machine. + +.. toctree:: + + arm/integratorcp + arm/versatile + arm/realview + arm/xscale + arm/palm + arm/nseries + arm/stellaris + arm/musicpal + arm/sx1 From patchwork Mon Mar 9 21:58:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 11428147 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 268C114E3 for ; Mon, 9 Mar 2020 21:59:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F15AB2253D for ; Mon, 9 Mar 2020 21:59:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dH1SrzP4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F15AB2253D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQQl-0004qt-5j for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Mar 2020 17:59:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46843) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQPr-0003Cr-8Y for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBQPp-0005fY-PE for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:27 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBQPp-0005eh-JJ for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:25 -0400 Received: by mail-wr1-x444.google.com with SMTP id r15so8141846wrx.6 for ; Mon, 09 Mar 2020 14:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KVtpWgIwwzMF83+VNcjr1nSyeeNlCy4J0V0Nywm5kyY=; b=dH1SrzP49JRlZlJlxMlHH1Xb5v7tPa65U/3XB+bKaDsrLfkjo00LWEYo6VPwfFM4ei aDQlnfEuMbocQCkndl0F+t/4dVngvXNz8iR2x0FcSDGyDF9RQ72hSPDoeR1jPzmu+igr LPkhLSjMKpTJBpz3Rl/T5AlzgHbKX4lXfeVRBTVIz5LIc0F8I1ec+oF2cXbgW8RcDr+k VpblqKG9Y4R/0CTJamfLLcasURFnpMv2twfPydelT6f7LVy5klqZDRnPExzt0kmzqzUh VHZN/DN5pIj8h5Wwsxyxenv9Luw1b333nppSe5ENyWNUj7UXg6XM1lY1WWbTK+Fe22b9 OczQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KVtpWgIwwzMF83+VNcjr1nSyeeNlCy4J0V0Nywm5kyY=; b=Uji7ZRjb7bMLjZjXUtxKiuVR/8WsvnFecAWAXcUOhutTlh/3eV0cydn0l1YIoTYxiJ CfEdd+cYcexPfVjSXmXFQ3EZ4Bi6ghGfcedDPY6+MI9XDWvkNzNXVZ/91VxdR0In/Q0Z uvxh0w0HiB/8qsM5hQTYIZRrTZkBkbqljR78Z6If373UjUxxVTboSwUT/K97vEvpeVzB J4zkupSf2nLqOMvcUerevOrLrC3zWs2f+e/vjENvqG4oKKePyx6dKT5AEMSnmj21p39J 3AVWjKGWaj2ReYryxzIgG1tiU5q5ORwLhjQwkou8L2NmpuAkH7Tz5mlFBELW/GBBMeRH gW3Q== X-Gm-Message-State: ANhLgQ1UJdwJowgqUXMqOoEF469pwmP/1lbmZCRpM2T5+EqJiXMGUOlq G4Nzwgg4rzjP+Lhbb9K7qG5BnA== X-Google-Smtp-Source: ADFU+vuRiC26y16qb8sQM+SwYsQV8qNQqFtL6kBvAZAWWqLE8uFROeiejtniqewPT4rBx4PBd/otGA== X-Received: by 2002:a05:6000:370:: with SMTP id f16mr16801789wrf.9.1583791104553; Mon, 09 Mar 2020 14:58:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm42207068wrm.3.2020.03.09.14.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 14:58:24 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 3/5] docs/system/target-arm.rst: Add some introductory text Date: Mon, 9 Mar 2020 21:58:16 +0000 Message-Id: <20200309215818.2021-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200309215818.2021-1-peter.maydell@linaro.org> References: <20200309215818.2021-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Niek Linnenbank Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Now we've moved the various bits of per-board documentation into their own files, the top level document is a little bare. Add some introductory information, including a note that many of the board models we support are currently undocumented. (Most sections of this new text were originally written by me for the wiki page https://wiki.qemu.org/Documentation/Platforms/ARM) Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Niek Linnenbank --- --- docs/system/target-arm.rst | 66 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index c7df6fc1f97..86ea6f2f568 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -1,9 +1,71 @@ .. _ARM-System-emulator: -ARM System emulator +Arm System emulator ------------------- -Use the executable ``qemu-system-arm`` to simulate a ARM machine. +QEMU can emulate both 32-bit and 64-bit Arm CPUs. Use the +``qemu-system-aarch64`` executable to simulate a 64-bit Arm machine. +You can use either ``qemu-system-arm`` or ``qemu-system-aarch64`` +to simulate a 32-bit Arm machine: in general, command lines that +work for ``qemu-system-arm`` will behave the same when used with +``qemu-system-aarch64``. + +QEMU has generally good support for Arm guests. It has support for +nearly fifty different machines. The reason we support so many is that +Arm hardware is much more widely varying than x86 hardware. Arm CPUs +are generally built into "system-on-chip" (SoC) designs created by +many different companies with different devices, and these SoCs are +then built into machines which can vary still further even if they use +the same SoC. Even with fifty boards QEMU does not cover more than a +small fraction of the Arm hardware ecosystem. + +The situation for 64-bit Arm is fairly similar, except that we don't +implement so many different machines. + +As well as the more common "A-profile" CPUs (which have MMUs and will +run Linux) QEMU also supports "M-profile" CPUs such as the Cortex-M0, +Cortex-M4 and Cortex-M33 (which are microcontrollers used in very +embedded boards). For most boards the CPU type is fixed (matching what +the hardware has), so typically you don't need to specify the CPU type +by hand, except for special cases like the ``virt`` board. + +Choosing a board model +====================== + +For QEMU's Arm system emulation, you must specify which board +model you want to use with the ``-M`` or ``--machine`` option; +there is no default. + +Because Arm systems differ so much and in fundamental ways, typically +operating system or firmware images intended to run on one machine +will not run at all on any other. This is often surprising for new +users who are used to the x86 world where every system looks like a +standard PC. (Once the kernel has booted, most userspace software +cares much less about the detail of the hardware.) + +If you already have a system image or a kernel that works on hardware +and you want to boot with QEMU, check whether QEMU lists that machine +in its ``-machine help`` output. If it is listed, then you can probably +use that board model. If it is not listed, then unfortunately your image +will almost certainly not boot on QEMU. (You might be able to +extract the filesystem and use that with a different kernel which +boots on a system that QEMU does emulate.) + +If you don't care about reproducing the idiosyncrasies of a particular +bit of hardware, such as small amount of RAM, no PCI or other hard +disk, etc., and just want to run Linux, the best option is to use the +``virt`` board. This is a platform which doesn't correspond to any +real hardware and is designed for use in virtual machines. You'll +need to compile Linux with a suitable configuration for running on +the ``virt`` board. ``virt`` supports PCI, virtio, recent CPUs and +large amounts of RAM. It also supports 64-bit CPUs. + +Board-specific documentation +============================ + +Unfortunately many of the Arm boards QEMU supports are currently +undocumented; you can get a complete list by running +``qemu-system-aarch64 --machine help``. .. toctree:: From patchwork Mon Mar 9 21:58:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 11428145 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB0AE138D for ; Mon, 9 Mar 2020 21:59:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0E482253D for ; Mon, 9 Mar 2020 21:59:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tI0y360I" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0E482253D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQQk-0004r2-Ud for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Mar 2020 17:59:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46861) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQPs-0003EI-0M for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBQPq-0005go-UC for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:27 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBQPq-0005fi-Nq for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:26 -0400 Received: by mail-wr1-x430.google.com with SMTP id r15so8141902wrx.6 for ; Mon, 09 Mar 2020 14:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2n3nGOj14Qa+RXY1pY3cDWtilSqrSMjx7cEnFu1bzAg=; b=tI0y360IxNZcmSKHSZt+fRHEfyRNE7SQC7aqAXfgjLVUs9ydbRMBvpjbyF4bnwt1Op AySe8OaxX1q6etNx5N6PXNyd0D7NJQm/cFTSBtB5N3vIgcxSjHmYfwGQYOOr2HRDulMU 6IPqMfnSNutKju149yK8S24LaAKQ3stdUEsJZ1r8eeY1PIbYBmSQ+GdyBKQh3IzsJcWj KMds8aapMCEzt52g6L2Y5Vhf21Dmqqpdj9fiMgeLMRYyNZe2F1o8e5qJk7Vn5zuPqCLR QIJWmgnP9lBJbTWhnMpQq6ibF9cRdWY2KAKQlTQ9yuNQGecRYgyPlOWpdqA6xNvoG+vF Zyyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2n3nGOj14Qa+RXY1pY3cDWtilSqrSMjx7cEnFu1bzAg=; b=cpe6aIYtma0abyfQkt4qvYczVRa3TJ2Fxr3HYdZv/10bMFF4ncPOAcVEIoB5AyEjrV 6y6m7X63zRH7xtwNO67neumisKfUcFHB1B2Jru8IXDaBXvv+sgKboRd+9mn3cRgegVmJ yWn1HYueC63welV+DfhIGk1NyFqjyy6puVVCTwPTJ8uxVBOshCCHPeER0Riry6j3+Q7O 6QaxS4BIQHMPMefhu5+yGrchiW12sTfR1LlOBnP0n5RUBVsqYwWH6TBmHJeGZr+0bS6V pgvvM8vj/2AxD0766lV5in+oTNp5BVuWb7BbIvIfhJcMnrjznDVmy/0UvGWxi6yVbSwt c0NQ== X-Gm-Message-State: ANhLgQ2PBzPEnp7jqx5CKs/8+sYkbsHHKY2ivY57a4Ccgsk55uiI5vZe d39NXRFBGqk1j9QFGUbUnVuEKw== X-Google-Smtp-Source: ADFU+vu01FclDTE79/VoHYeB4tnZHNFy0CBsbCSItxwPUFAn5EQsQ9ecvMgstSQsU71ZU6taCvn/mg== X-Received: by 2002:a05:6000:101:: with SMTP id o1mr9165661wrx.239.1583791105719; Mon, 09 Mar 2020 14:58:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm42207068wrm.3.2020.03.09.14.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 14:58:25 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 4/5] docs: Move arm-cpu-features.rst into the system manual Date: Mon, 9 Mar 2020 21:58:17 +0000 Message-Id: <20200309215818.2021-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200309215818.2021-1-peter.maydell@linaro.org> References: <20200309215818.2021-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Niek Linnenbank Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Now we have somewhere to put arm-specific rst documentation, we can move arm-cpu-features.rst from the docs/ top level directory into docs/system/arm/. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Niek Linnenbank --- .../{arm-cpu-features.rst => system/arm/cpu-features.rst} | 8 +------- docs/system/target-arm.rst | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) rename docs/{arm-cpu-features.rst => system/arm/cpu-features.rst} (99%) diff --git a/docs/arm-cpu-features.rst b/docs/system/arm/cpu-features.rst similarity index 99% rename from docs/arm-cpu-features.rst rename to docs/system/arm/cpu-features.rst index fc1623aeca5..7495b7b672b 100644 --- a/docs/arm-cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -1,11 +1,5 @@ +Arm CPU Features ================ -ARM CPU Features -================ - -Examples of probing and using ARM CPU features - -Introduction -============ CPU features are optional features that a CPU of supporting type may choose to implement or not. In QEMU, optional CPU features have diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index 86ea6f2f568..1425bd5303a 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -78,3 +78,9 @@ undocumented; you can get a complete list by running arm/stellaris arm/musicpal arm/sx1 + +Arm CPU features +================ + +.. toctree:: + arm/cpu-features From patchwork Mon Mar 9 21:58:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 11428153 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C57C5139A for ; Mon, 9 Mar 2020 22:02:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BBC32253D for ; Mon, 9 Mar 2020 22:02:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="B2lvcL9m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BBC32253D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQTg-00007y-PH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Mar 2020 18:02:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46931) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBQPw-0003O2-4U for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBQPs-0005i3-Ut for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:32 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:45842) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBQPs-0005hU-Km for qemu-devel@nongnu.org; Mon, 09 Mar 2020 17:58:28 -0400 Received: by mail-wr1-x432.google.com with SMTP id m9so4189575wro.12 for ; Mon, 09 Mar 2020 14:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e/H6e6OnZYU3B9qqPIddUuN368JkSEB2cY7sQs/JKEU=; b=B2lvcL9mYQ4lduihJIgeGb1RO9bwhxjeI7NkSvoKLbBzRO0G2EfZ7NQg4IWJchNB5y YSR0q8t0hMtXikDGRGK61r8imUgN97fK8n1n7n1t2t9Ew6f/60DPId4YQf/xUymW7Sw0 OFU1IhivZO+lJiCLFPV8l2Ci7arQ1AszEb8607EdA6t1x0PbeLBidL7Rfdgf7kqqkBHw 5ZDv0AH5qeBfyioomaPpPP6WL9wckovb74QA+1fO1lFsGzuIjhRs8TcdxfITj/Tr9Zwe Eh9FtZylInAT0FTFzy5AEMHTAoloIKXJ9cov/OZCqAZ5MaIVaBpKft0r5/INf5Wh30IL bByQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e/H6e6OnZYU3B9qqPIddUuN368JkSEB2cY7sQs/JKEU=; b=aRYDsRfb08XveZJV1ZmxstDM0XNasnWu7aKYuaJs3yZWDkWXBbG9CmyLJgFEwqL241 GwPGHcD7L4/Yk1EmnK+0TfDdI9dwi+5d6pS+asz71qLggM1HvY1Y1cL0anWy55xf6Xk6 00rRPpHpsTrZRcEg1/FP+QcSl3hg1zD61llPJeckJuH+8xR8GunxqJl3JemGC4kNbu91 s3Xt1l9C2kwRTByw1q7PEBPpoBr/8Zs1kgEewnzbFHfqkFfkNZVaceedQaSXrfDgWFzw Lgb+4qSGYwkrS+9buqgfZpDrmDoEhV1mIazDgps6jyHs6iatV005P7q2QzBjrM0cdSCT XuoA== X-Gm-Message-State: ANhLgQ3rNk5aX/YIOosJCQ6NNHrSo4hIZwuxE9gHO+ux456J0GJ968rL Ql3PzlZZ4fg+92jais5f1NED0oNlhxwryA== X-Google-Smtp-Source: ADFU+vsOV0SYArlQ8SbH+2j35pB6oy8AdMDd30TvVfvMdJqdbs5dxAOJ0Ftgd4p9ITfH+eT++kDz4A== X-Received: by 2002:adf:eb51:: with SMTP id u17mr24410532wrn.29.1583791107287; Mon, 09 Mar 2020 14:58:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm42207068wrm.3.2020.03.09.14.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 14:58:26 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 5/5] docs: Be consistent about capitalization of 'Arm' Date: Mon, 9 Mar 2020 21:58:18 +0000 Message-Id: <20200309215818.2021-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200309215818.2021-1-peter.maydell@linaro.org> References: <20200309215818.2021-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Niek Linnenbank Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The company 'Arm' went through a rebranding some years back involving a recapitalization from 'ARM' to 'Arm'. As a result our documentation is a bit inconsistent between the two forms. It's not worth trying to update everywhere in QEMU, but it's easy enough to make docs/ consistent. Note that "ARMv8" and similar architecture names, and older CPU names like "ARM926" still retain all-caps. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Niek Linnenbank --- I don't feel very strongly about this change, but it looked a bit odd where earlier rearrangements in this series meant that some documents had a mix of both styles, so I thought I might as well fix all of docs/. --- docs/can.txt | 2 +- docs/devel/atomics.txt | 2 +- docs/devel/multi-thread-tcg.txt | 8 ++++---- docs/replay.txt | 2 +- docs/specs/fw_cfg.txt | 2 +- docs/devel/kconfig.rst | 2 +- docs/devel/loads-stores.rst | 2 +- docs/devel/tcg.rst | 2 +- docs/specs/tpm.rst | 6 +++--- docs/system/arm/cpu-features.rst | 4 ++-- docs/system/arm/integratorcp.rst | 2 +- docs/system/arm/musicpal.rst | 2 +- docs/system/arm/nseries.rst | 2 +- docs/system/arm/palm.rst | 2 +- docs/system/arm/realview.rst | 4 ++-- docs/system/arm/sx1.rst | 2 +- docs/system/arm/versatile.rst | 2 +- docs/system/arm/xscale.rst | 2 +- docs/user/main.rst | 8 ++++---- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/can.txt b/docs/can.txt index 9fa6ed51c82..11ed8f2d68b 100644 --- a/docs/can.txt +++ b/docs/can.txt @@ -13,7 +13,7 @@ controller is implemented. The PCI addon card hardware has been selected as the first CAN interface to implement because such device can be easily connected -to systems with different CPU architectures (x86, PowerPC, ARM, etc.). +to systems with different CPU architectures (x86, PowerPC, Arm, etc.). The project has been initially started in frame of RTEMS GSoC 2013 slot by Jin Yang under our mentoring The initial idea was to provide generic diff --git a/docs/devel/atomics.txt b/docs/devel/atomics.txt index a4db3a4aaad..67bdf826280 100644 --- a/docs/devel/atomics.txt +++ b/docs/devel/atomics.txt @@ -87,7 +87,7 @@ Sequentially consistent loads and stores can be done using: atomic_xchg(ptr, val) for stores However, they are quite expensive on some platforms, notably POWER and -ARM. Therefore, qemu/atomic.h provides two primitives with slightly +Arm. Therefore, qemu/atomic.h provides two primitives with slightly weaker constraints: typeof(*ptr) atomic_mb_read(ptr) diff --git a/docs/devel/multi-thread-tcg.txt b/docs/devel/multi-thread-tcg.txt index 782bebc28b4..3c85ac0eab9 100644 --- a/docs/devel/multi-thread-tcg.txt +++ b/docs/devel/multi-thread-tcg.txt @@ -227,7 +227,7 @@ minimise contention. (Current solution) MMIO access automatically serialises hardware emulation by way of the -BQL. Currently ARM targets serialise all ARM_CP_IO register accesses +BQL. Currently Arm targets serialise all ARM_CP_IO register accesses and also defer the reset/startup of vCPUs to the vCPU context by way of async_run_on_cpu(). @@ -268,7 +268,7 @@ ordered backends this could become a NOP. Aside from explicit standalone memory barrier instructions there are also implicit memory ordering semantics which comes with each guest memory access instruction. For example all x86 load/stores come with -fairly strong guarantees of sequential consistency where as ARM has +fairly strong guarantees of sequential consistency whereas Arm has special variants of load/store instructions that imply acquire/release semantics. @@ -317,7 +317,7 @@ x86 cmpxchg instruction. The second type offer a pair of load/store instructions which offer a guarantee that a region of memory has not been touched between the -load and store instructions. An example of this is ARM's ldrex/strex +load and store instructions. An example of this is Arm's ldrex/strex pair where the strex instruction will return a flag indicating a successful store only if no other CPU has accessed the memory region since the ldrex. @@ -339,7 +339,7 @@ CURRENT OPEN QUESTIONS: The TCG provides a number of atomic helpers (tcg_gen_atomic_*) which can be used directly or combined to emulate other instructions like -ARM's ldrex/strex instructions. While they are susceptible to the ABA +Arm's ldrex/strex instructions. While they are susceptible to the ABA problem so far common guests have not implemented patterns where this may be a problem - typically presenting a locking ABI which assumes cmpxchg like semantics. diff --git a/docs/replay.txt b/docs/replay.txt index f4619a62a3d..70c27edb362 100644 --- a/docs/replay.txt +++ b/docs/replay.txt @@ -19,7 +19,7 @@ Deterministic replay has the following features: the memory, state of the hardware devices, clocks, and screen of the VM. * Writes execution log into the file for later replaying for multiple times on different machines. - * Supports i386, x86_64, and ARM hardware platforms. + * Supports i386, x86_64, and Arm hardware platforms. * Performs deterministic replay of all operations with keyboard and mouse input devices. diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index 08c00bdf44a..8f1ebc66fa4 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -82,7 +82,7 @@ Selector Register IOport: 0x510 Data Register IOport: 0x511 DMA Address IOport: 0x514 -=== ARM Register Locations === +=== Arm Register Locations === Selector Register address: Base + 8 (2 bytes) Data Register address: Base + 0 (8 bytes) diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index b7bca447046..e5df72b3422 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -8,7 +8,7 @@ time different targets can share large amounts of code. For example, a POWER and an x86 board can run the same code to emulate a PCI network card, even though the boards use different PCI host bridges, and they can run the same code to emulate a SCSI disk while using different -SCSI adapters. ARM, s390 and x86 boards can all present a virtio-blk +SCSI adapters. Arm, s390 and x86 boards can all present a virtio-blk disk to their guests, but with three different virtio guest interfaces. Each QEMU target enables a subset of the boards, devices and buses that diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 03aa9e7ff80..0d99eb24c1b 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -302,7 +302,7 @@ way QEMU defines the view of memory that a device or CPU has. or bus fabric.) Each CPU has an AddressSpace. Some kinds of CPU have more than -one AddressSpace (for instance ARM guest CPUs have an AddressSpace +one AddressSpace (for instance Arm guest CPUs have an AddressSpace for the Secure world and one for NonSecure if they implement TrustZone). Devices which can do DMA-type operations should generally have an AddressSpace. There is also a "system address space" which typically diff --git a/docs/devel/tcg.rst b/docs/devel/tcg.rst index 4956a30a4e6..4ebde44b9d7 100644 --- a/docs/devel/tcg.rst +++ b/docs/devel/tcg.rst @@ -83,7 +83,7 @@ memory until the end of the translation block. This is done for internal emulation state that is rarely accessed directly by the program and/or changes very often throughout the execution of a translation block---this includes condition codes on x86, delay slots on SPARC, conditional execution on -ARM, and so on. This state is stored for each target instruction, and +Arm, and so on. This state is stored for each target instruction, and looked up on exceptions. MMU emulation diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index da9eb39ca97..5e61238bc5f 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -25,7 +25,7 @@ QEMU files related to TPM TIS interface: Both an ISA device and a sysbus device are available. The former is used with pc/q35 machine while the latter can be instantiated in the -ARM virt machine. +Arm virt machine. CRB interface ------------- @@ -331,7 +331,7 @@ In case a pSeries machine is emulated, use the following command line: -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \ -drive file=test.img,format=raw,if=none,id=drive-virtio-disk0 -In case an ARM virt machine is emulated, use the following command line: +In case an Arm virt machine is emulated, use the following command line: .. code-block:: console @@ -346,7 +346,7 @@ In case an ARM virt machine is emulated, use the following command line: -drive if=pflash,format=raw,file=flash0.img,readonly \ -drive if=pflash,format=raw,file=flash1.img - On ARM, ACPI boot with TPM is not yet supported. + On Arm, ACPI boot with TPM is not yet supported. In case SeaBIOS is used as firmware, it should show the TPM menu item after entering the menu with 'ESC'. diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-features.rst index 7495b7b672b..2d5c06cd016 100644 --- a/docs/system/arm/cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -5,9 +5,9 @@ CPU features are optional features that a CPU of supporting type may choose to implement or not. In QEMU, optional CPU features have corresponding boolean CPU proprieties that, when enabled, indicate that the feature is implemented, and, conversely, when disabled, -indicate that it is not implemented. An example of an ARM CPU feature +indicate that it is not implemented. An example of an Arm CPU feature is the Performance Monitoring Unit (PMU). CPU types such as the -Cortex-A15 and the Cortex-A57, which respectively implement ARM +Cortex-A15 and the Cortex-A57, which respectively implement Arm architecture reference manuals ARMv7-A and ARMv8-A, may both optionally implement PMUs. For example, if a user wants to use a Cortex-A15 without a PMU, then the `-cpu` parameter should contain `pmu=off` on the QEMU diff --git a/docs/system/arm/integratorcp.rst b/docs/system/arm/integratorcp.rst index 3232b43a08b..e6f050f602b 100644 --- a/docs/system/arm/integratorcp.rst +++ b/docs/system/arm/integratorcp.rst @@ -1,7 +1,7 @@ Integrator/CP (``integratorcp``) ================================ -The ARM Integrator/CP board is emulated with the following devices: +The Arm Integrator/CP board is emulated with the following devices: - ARM926E, ARM1026E, ARM946E, ARM1136 or Cortex-A8 CPU diff --git a/docs/system/arm/musicpal.rst b/docs/system/arm/musicpal.rst index 35c22212486..9de380edf81 100644 --- a/docs/system/arm/musicpal.rst +++ b/docs/system/arm/musicpal.rst @@ -4,7 +4,7 @@ Freecom MusicPal (``musicpal``) The Freecom MusicPal internet radio emulation includes the following elements: -- Marvell MV88W8618 ARM core. +- Marvell MV88W8618 Arm core. - 32 MB RAM, 256 KB SRAM, 8 MB flash. diff --git a/docs/system/arm/nseries.rst b/docs/system/arm/nseries.rst index b000b6d13bb..cd9edf5d88b 100644 --- a/docs/system/arm/nseries.rst +++ b/docs/system/arm/nseries.rst @@ -4,7 +4,7 @@ Nokia N800 and N810 tablets (``n800``, ``n810``) Nokia N800 and N810 internet tablets (known also as RX-34 and RX-44 / 48) emulation supports the following elements: -- Texas Instruments OMAP2420 System-on-chip (ARM 1136 core) +- Texas Instruments OMAP2420 System-on-chip (ARM1136 core) - RAM and non-volatile OneNAND Flash memories diff --git a/docs/system/arm/palm.rst b/docs/system/arm/palm.rst index 0eabf63e0e7..47ff9b36d46 100644 --- a/docs/system/arm/palm.rst +++ b/docs/system/arm/palm.rst @@ -4,7 +4,7 @@ Palm Tungsten|E PDA (``cheetah``) The Palm Tungsten|E PDA (codename \"Cheetah\") emulation includes the following elements: -- Texas Instruments OMAP310 System-on-chip (ARM 925T core) +- Texas Instruments OMAP310 System-on-chip (ARM925T core) - ROM and RAM memories (ROM firmware image can be loaded with -option-rom) diff --git a/docs/system/arm/realview.rst b/docs/system/arm/realview.rst index 8e08eb5da16..65f5be346b1 100644 --- a/docs/system/arm/realview.rst +++ b/docs/system/arm/realview.rst @@ -1,7 +1,7 @@ Arm Realview boards (``realview-eb``, ``realview-eb-mpcore``, ``realview-pb-a8``, ``realview-pbx-a9``) ====================================================================================================== -Several variants of the ARM RealView baseboard are emulated, including +Several variants of the Arm RealView baseboard are emulated, including the EB, PB-A8 and PBX-A9. Due to interactions with the bootloader, only certain Linux kernel configurations work out of the box on these boards. @@ -14,7 +14,7 @@ The following devices are emulated: - ARM926E, ARM1136, ARM11MPCore, Cortex-A8 or Cortex-A9 MPCore CPU -- ARM AMBA Generic/Distributed Interrupt Controller +- Arm AMBA Generic/Distributed Interrupt Controller - Four PL011 UARTs diff --git a/docs/system/arm/sx1.rst b/docs/system/arm/sx1.rst index 321993bc098..8bce30d4b25 100644 --- a/docs/system/arm/sx1.rst +++ b/docs/system/arm/sx1.rst @@ -4,7 +4,7 @@ Siemens SX1 (``sx1``, ``sx1-v1``) The Siemens SX1 models v1 and v2 (default) basic emulation. The emulation includes the following elements: -- Texas Instruments OMAP310 System-on-chip (ARM 925T core) +- Texas Instruments OMAP310 System-on-chip (ARM925T core) - ROM and RAM memories (ROM firmware image can be loaded with -pflash) V1 1 Flash of 16MB and 1 Flash of 8MB V2 1 Flash of 32MB diff --git a/docs/system/arm/versatile.rst b/docs/system/arm/versatile.rst index 48b6ca0a020..51221c30a48 100644 --- a/docs/system/arm/versatile.rst +++ b/docs/system/arm/versatile.rst @@ -1,7 +1,7 @@ Arm Versatile boards (``versatileab``, ``versatilepb``) ======================================================= -The ARM Versatile baseboard is emulated with the following devices: +The Arm Versatile baseboard is emulated with the following devices: - ARM926E, ARM1136 or Cortex-A8 CPU diff --git a/docs/system/arm/xscale.rst b/docs/system/arm/xscale.rst index 19da2eff352..89ec93e904e 100644 --- a/docs/system/arm/xscale.rst +++ b/docs/system/arm/xscale.rst @@ -4,7 +4,7 @@ Sharp XScale-based PDA models (``akita``, ``borzoi``, ``spitz``, ``terrier``) The XScale-based clamshell PDA models (\"Spitz\", \"Akita\", \"Borzoi\" and \"Terrier\") emulation includes the following peripherals: -- Intel PXA270 System-on-chip (ARM V5TE core) +- Intel PXA270 System-on-chip (ARMv5TE core) - NAND Flash memory diff --git a/docs/user/main.rst b/docs/user/main.rst index ca69f7727d5..bd99b0fdbe9 100644 --- a/docs/user/main.rst +++ b/docs/user/main.rst @@ -35,7 +35,7 @@ QEMU user space emulation has the following notable features: On Linux, QEMU can emulate the ``clone`` syscall and create a real host thread (with a separate virtual CPU) for each emulated thread. Note that not all targets currently emulate atomic operations - correctly. x86 and ARM use a global lock in order to preserve their + correctly. x86 and Arm use a global lock in order to preserve their semantics. QEMU was conceived so that ultimately it can emulate itself. Although it @@ -173,11 +173,11 @@ Other binaries user mode (Alpha) ``qemu-alpha`` TODO. -user mode (ARM) +user mode (Arm) ``qemu-armeb`` TODO. -user mode (ARM) -``qemu-arm`` is also capable of running ARM \"Angel\" semihosted ELF +user mode (Arm) +``qemu-arm`` is also capable of running Arm \"Angel\" semihosted ELF binaries (as implemented by the arm-elf and arm-eabi Newlib/GDB configurations), and arm-uclinux bFLT format binaries.