From patchwork Fri Apr 24 15:19:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 47567 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 71A3720553 for ; Fri, 24 Apr 2015 15:19:50 +0000 (UTC) Received: by wghm4 with SMTP id m4sf12560021wgh.2 for ; Fri, 24 Apr 2015 08:19:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=pPwvr+FMDR3gE9B64KWjqJZusjEUR8kBO5DMvthFM/A=; b=bup7sMk++KqOjYehE6HEJwM1/l0OM//FIOHZqEfQzX7NhrTCfF7Mkg3za0Sfiir0vM ofHbmxAZZ9xtHeR4zar66gudadCJCKbta1AQSM8DrAHME710EqHEghjTn4Xqrt4U61Qc UfjqE0d4pSNega5Krghr9VNcS5IVPaHJ0U3BY3hwZBmD5hbOStw9eU3KvpYCVWxuZNo8 oy+8iJJ9zllUMT2K3Y+Ph+baldif8htcP8yizdFrnBwJmvSLuYmP2mDWiOsqj6Bc3n3V 8zXhgusKRJGGSWD0iYpj/lKGPUxGIbsn44MTX3jNmcuQ3N6IZECQ4q4tOGVv9uxqBFKa t1nw== X-Gm-Message-State: ALoCoQn8pL+El/8ovdXX/FxRzma/E9S3WJgrNIx4QQCIJxbSEdP/xVyS9vwUz1Yg19652zwJEmXl X-Received: by 10.152.88.73 with SMTP id be9mr4459339lab.2.1429888789693; Fri, 24 Apr 2015 08:19:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.65 with SMTP id c1ls464198lae.46.gmail; Fri, 24 Apr 2015 08:19:49 -0700 (PDT) X-Received: by 10.152.87.70 with SMTP id v6mr7216127laz.30.1429888789555; Fri, 24 Apr 2015 08:19:49 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id rk9si8470335lbb.152.2015.04.24.08.19.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2015 08:19:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbcga7 with SMTP id ga7so39113788lbc.1 for ; Fri, 24 Apr 2015 08:19:49 -0700 (PDT) X-Received: by 10.152.4.137 with SMTP id k9mr7259315lak.29.1429888789424; Fri, 24 Apr 2015 08:19:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.67.65 with SMTP id l1csp1257584lbt; Fri, 24 Apr 2015 08:19:48 -0700 (PDT) X-Received: by 10.194.19.197 with SMTP id h5mr16460154wje.109.1429888786248; Fri, 24 Apr 2015 08:19:46 -0700 (PDT) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com. [209.85.212.179]) by mx.google.com with ESMTPS id i16si4546897wiv.105.2015.04.24.08.19.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2015 08:19:46 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.179 as permitted sender) client-ip=209.85.212.179; Received: by widdi4 with SMTP id di4so26141625wid.0 for ; Fri, 24 Apr 2015 08:19:46 -0700 (PDT) X-Received: by 10.180.90.236 with SMTP id bz12mr4728228wib.33.1429888786003; Fri, 24 Apr 2015 08:19:46 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id ei8sm17340328wjd.32.2015.04.24.08.19.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Apr 2015 08:19:45 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, peter.maydell@linaro.org, agraf@suse.de, pbonzini@redhat.com Cc: christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, alex.bennee@linaro.org, b.reynal@virtualopensystems.com, Bharat.Bhushan@freescale.com Subject: [PATCH v12 4/4] hw/arm/virt: change indentation in a15memmap Date: Fri, 24 Apr 2015 16:19:33 +0100 Message-Id: <1429888773-11730-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1429888773-11730-1-git-send-email-eric.auger@linaro.org> References: <1429888773-11730-1-git-send-email-eric.auger@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Re-indent in a15memmap after VIRT_PLATFORM_BUS introduction Signed-off-by: Eric Auger Reviewed-by: Alex Bennée --- v11 -> v12: - Add Alex R-b --- hw/arm/virt.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index efa3216..dfe97e1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -128,26 +128,26 @@ typedef struct { */ static const MemMapEntry a15memmap[] = { /* Space up to 0x8000000 is reserved for a boot ROM */ - [VIRT_FLASH] = { 0, 0x08000000 }, - [VIRT_CPUPERIPHS] = { 0x08000000, 0x00020000 }, + [VIRT_FLASH] = { 0, 0x08000000 }, + [VIRT_CPUPERIPHS] = { 0x08000000, 0x00020000 }, /* GIC distributor and CPU interfaces sit inside the CPU peripheral space */ - [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, - [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, - [VIRT_UART] = { 0x09000000, 0x00001000 }, - [VIRT_RTC] = { 0x09010000, 0x00001000 }, - [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, - [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, + [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, + [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, + [VIRT_UART] = { 0x09000000, 0x00001000 }, + [VIRT_RTC] = { 0x09010000, 0x00001000 }, + [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, + [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, /* * PCIE verbose map: * - * MMIO window { 0x10000000, 0x2eff0000 }, - * PIO window { 0x3eff0000, 0x00010000 }, - * ECAM { 0x3f000000, 0x01000000 }, + * MMIO window { 0x10000000, 0x2eff0000 }, + * PIO window { 0x3eff0000, 0x00010000 }, + * ECAM { 0x3f000000, 0x01000000 }, */ - [VIRT_PCIE] = { 0x10000000, 0x30000000 }, - [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, + [VIRT_PCIE] = { 0x10000000, 0x30000000 }, + [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; static const int a15irqmap[] = {