From patchwork Thu Apr 14 20:59:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 1034 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:48:28 -0000 Delivered-To: patches@linaro.org Received: by 10.68.59.138 with SMTP id z10cs91014pbq; Thu, 14 Apr 2011 13:59:47 -0700 (PDT) Received: by 10.43.69.138 with SMTP id yc10mr1780715icb.74.1302814787336; Thu, 14 Apr 2011 13:59:47 -0700 (PDT) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id ye2si5689192icb.155.2011.04.14.13.59.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Apr 2011 13:59:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of grant.likely@secretlab.ca) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of grant.likely@secretlab.ca) smtp.mail=grant.likely@secretlab.ca Received: by iyi12 with SMTP id 12so5132515iyi.37 for ; Thu, 14 Apr 2011 13:59:46 -0700 (PDT) Received: by 10.42.148.9 with SMTP id p9mr1821783icv.19.1302814786509; Thu, 14 Apr 2011 13:59:46 -0700 (PDT) Received: from localhost (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id i3sm1421140iby.57.2011.04.14.13.59.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Apr 2011 13:59:46 -0700 (PDT) Sender: Grant Likely Received: from [127.0.1.1] (localhost [127.0.0.1]) by localhost (Postfix) with ESMTP id D1826182E08; Thu, 14 Apr 2011 14:59:44 -0600 (MDT) Subject: [PATCH 2/2] arm/dt: vexpress: Update basic DT to use skeleton.dtsi file. To: nicolas.pitre@linaro.org, lorenzo.pieralisi@arm.com, linaro-kernel@lists.linaro.org, patches@linaro.org From: Grant Likely Date: Thu, 14 Apr 2011 14:59:44 -0600 Message-ID: <20110414205944.10689.75524.stgit@ponder> In-Reply-To: <20110414205939.10689.75468.stgit@ponder> References: <20110414205939.10689.75468.stgit@ponder> User-Agent: StGit/0.15 MIME-Version: 1.0 Converted .dts file to use skeleton.dtsi, and added 'dtbs' target. Signed-off-by: Grant Likely --- arch/arm/boot/dts/vexpress.dts | 10 +--------- arch/arm/mach-vexpress/Makefile.boot | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/vexpress.dts b/arch/arm/boot/dts/vexpress.dts index bea2a18..5f3bc1d 100644 --- a/arch/arm/boot/dts/vexpress.dts +++ b/arch/arm/boot/dts/vexpress.dts @@ -1,18 +1,10 @@ /dts-v1/; +/include/ "skeleton.dtsi" / { model = "ARM Versatile Express"; compatible = "arm,vexpress"; - - #address-cells = <1>; - #size-cells = <1>; - - aliases { }; - - chosen { }; - memory { - device_type = "memory"; reg = <0x60000000 0x40000000>; }; }; diff --git a/arch/arm/mach-vexpress/Makefile.boot b/arch/arm/mach-vexpress/Makefile.boot index 07c2d9c..9920a10 100644 --- a/arch/arm/mach-vexpress/Makefile.boot +++ b/arch/arm/mach-vexpress/Makefile.boot @@ -1,3 +1,5 @@ zreladdr-y := 0x60008000 params_phys-y := 0x60000100 initrd_phys-y := 0x60800000 + +dtb-$(CONFIG_ARCH_VEXPRESS_CA9X4) += vexpress.dtb