From patchwork Tue Sep 9 07:54:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37044 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 270A820491 for ; Tue, 9 Sep 2014 07:54:54 +0000 (UTC) Received: by mail-oi0-f71.google.com with SMTP id e131sf24662249oig.10 for ; Tue, 09 Sep 2014 00:54:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=3k75vVoEbLu5nfy4OQzTjZKcvAR970cisxDg9B0EsiA=; b=K9YaSe7Oz9lEfaC9hVYeG8e8u6nuI4nmXyLFKRKW/FRuZI0M3E/peavKYopQurYi7g 6HboC4uialLwIY4UPdxOGqlGU1ViD+0UHwKs3Wf+ds6Ec2uP0FD/pK1zvWcknwI8zwGF 8psVYctMlLh26UR4CFmScpwAVHwj4AEekNMT6cZZnGatdyodICwK8nPvi6Kh/6JPTQB3 aFYstSRDfv69MYKnM4XVDG8OR+KdFhnG9vUjzQc76yzeKjWbHhBH6DxspUVFxD5vTgrp pd9YC8pw+LGGe8V/8HBp9SqPjj9qVEqPMRtJsC+Kghw5y01eHGQVjX8zqsqNGdMfy6ZI kNoA== X-Gm-Message-State: ALoCoQlQ+ghBxexcHW4P97FsGqEby7y/QD0Lkj7wjwkwoZC/1nbScoXdmNXasgrIltihaTK2OYRK X-Received: by 10.50.57.111 with SMTP id h15mr15971407igq.3.1410249293775; Tue, 09 Sep 2014 00:54:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.47 with SMTP id k44ls1983185qgd.73.gmail; Tue, 09 Sep 2014 00:54:53 -0700 (PDT) X-Received: by 10.221.26.130 with SMTP id rm2mr4636332vcb.47.1410249293693; Tue, 09 Sep 2014 00:54:53 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ej9si4939370vcb.25.2014.09.09.00.54.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so16773947vcb.11 for ; Tue, 09 Sep 2014 00:54:53 -0700 (PDT) X-Received: by 10.221.24.135 with SMTP id re7mr772005vcb.53.1410249293619; Tue, 09 Sep 2014 00:54:53 -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.221.45.67 with SMTP id uj3csp246178vcb; Tue, 9 Sep 2014 00:54:53 -0700 (PDT) X-Received: by 10.194.185.81 with SMTP id fa17mr1464172wjc.114.1410249292685; Tue, 09 Sep 2014 00:54:52 -0700 (PDT) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by mx.google.com with ESMTPS id o14si17021762wie.41.2014.09.09.00.54.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:52 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.43 as permitted sender) client-ip=74.125.82.43; Received: by mail-wg0-f43.google.com with SMTP id x12so3336330wgg.26 for ; Tue, 09 Sep 2014 00:54:52 -0700 (PDT) X-Received: by 10.180.206.230 with SMTP id lr6mr12036314wic.82.1410249292280; Tue, 09 Sep 2014 00:54:52 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id xt6sm13873858wjc.14.2014.09.09.00.54.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:51 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com Subject: [PATCH v3 4/6] hw/arm/boot: load_dtb becomes non static arm_load_dtb Date: Tue, 9 Sep 2014 08:54:31 +0100 Message-Id: <1410249273-6063-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> References: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> 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.220.180 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: , load_dtb is renamed into arm_load_dtb and becomes non static. it will be used by machvirt for dynamic instantiation of platform devices Signed-off-by: Eric Auger --- v2 -> v3: load_dtb renamed into arm_load_dtb --- hw/arm/boot.c | 4 ++-- include/hw/arm/arm.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e32f2f4..79fe0f1 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -312,7 +312,7 @@ static void set_kernel_args_old(const struct arm_boot_info *info) } } -static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) +int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo) { void *fdt = NULL; int size, rc; @@ -569,7 +569,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) */ hwaddr dtb_start = QEMU_ALIGN_UP(info->initrd_start + initrd_size, 4096); - if (load_dtb(dtb_start, info)) { + if (arm_load_dtb(dtb_start, info)) { exit(1); } fixupcontext[FIXUP_ARGPTR] = dtb_start; diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index cefc9e6..e60c4c0 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -68,6 +68,7 @@ struct arm_boot_info { hwaddr entry; }; void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info); +int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo); /* Multiplication factor to convert from system clock ticks to qemu timer ticks. */