From patchwork Tue Nov 16 22:41:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dirk.brandewie@gmail.com X-Patchwork-Id: 330051 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAGMhiGC031444 for ; Tue, 16 Nov 2010 22:43:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756625Ab0KPWmR (ORCPT ); Tue, 16 Nov 2010 17:42:17 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:38110 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755803Ab0KPWmQ (ORCPT ); Tue, 16 Nov 2010 17:42:16 -0500 Received: by mail-iw0-f174.google.com with SMTP id 35so1357519iwn.19 for ; Tue, 16 Nov 2010 14:42:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=YryPnTMxWLWMMQgfiOmdjuIJ4bp/uwYgGOH9DqTJoK8=; b=AcbL3jyaSJlFdE1qK/xqES6G1m4uAHHODNUMdB7OHAu689Y0Jm1w+rDjbW96q8B7m9 XKWhEILfCPfmzn9gbKYB51a7KzMxrEOtnm5hiXFECFEXlfnHocErNuGtnbgnwCArHo9N TZd+GLZQj22+8oCaMaK803A+z/czQ+gAykUfQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=eIlTh6yoKkBOzADtY74GmS+mT2qju+CmhdugmYCulBgeYrGOrtgo9fSkKZ75stvBKL 4QIeEETRBzAFQDGkj/YFXqbnk00z4WVI0Wnq4t5eu4taUADL8mHmRfWF3GtWub5FfAIn 9N4mao8EinDpscw9DA6bFA6kLN9IMUymi/pqk= Received: by 10.231.16.69 with SMTP id n5mr2660939iba.5.1289947334073; Tue, 16 Nov 2010 14:42:14 -0800 (PST) Received: from localhost.localdomain (pool-173-50-249-160.ptldor.fios.verizon.net [173.50.249.160]) by mx.google.com with ESMTPS id gy41sm1485952ibb.5.2010.11.16.14.42.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 16 Nov 2010 14:42:13 -0800 (PST) From: dirk.brandewie@gmail.com To: devicetree-discuss@lists.ozlabs.org Cc: sodaville@linutronix.de, arjan@linux.intel.com, dirk.brandewie@gmail.com, linuxppc-dev@lists.ozlabs.org, microblaze-uclinux@itee.uq.edu.au, linux-arch@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] of: Add support for linking device tree blobs into vmlinux Date: Tue, 16 Nov 2010 14:41:36 -0800 Message-Id: <9129f0a21ea48fb2dcb89cea290e88f3e8c0d8a2.1289943240.git.dirk.brandewie@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Nov 2010 22:43:44 +0000 (UTC) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bd69d79..ea671e7 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -67,7 +67,14 @@ * Align to a 32 byte boundary equal to the * alignment gcc 4.5 uses for a struct */ -#define STRUCT_ALIGN() . = ALIGN(32) +#define STRUCT_ALIGNMENT 32 +#define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT) + +/* Device tree blobs linked into the kernel need to have proper + * structure alignment to be parsed by the flat device tree library + * used in early boot +*/ +#define DTB_ALIGNMENT STRUCT_ALIGNMENT /* The actual configuration determine if the init/exit sections * are handled as text/data or they can be discarded (which @@ -146,6 +153,13 @@ #define TRACE_SYSCALLS() #endif + +#define KERNEL_DTB() \ + . = ALIGN(DTB_ALIGNMENT); \ + VMLINUX_SYMBOL(__dtb_start) = .; \ + *(.dtb.init.rodata) \ + VMLINUX_SYMBOL(__dtb_end) = .; + /* .data section */ #define DATA_DATA \ *(.data) \ @@ -468,7 +482,8 @@ MCOUNT_REC() \ DEV_DISCARD(init.rodata) \ CPU_DISCARD(init.rodata) \ - MEM_DISCARD(init.rodata) + MEM_DISCARD(init.rodata) \ + KERNEL_DTB() #define INIT_TEXT \ *(.init.text) \ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 4c72c11..29db062 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -200,6 +200,26 @@ quiet_cmd_gzip = GZIP $@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \ (rm -f $@ ; false) +# DTC +# --------------------------------------------------------------------------- +$(obj)/%.dtb.S: $(obj)/%.dtb FORCE + @echo '#include ' > $@ + @echo '.section .dtb.init.rodata,"a"' >> $@ + @echo '.balign DTB_ALIGNMENT' >> $@ + @echo '.global __dtb_$(*F)_begin' >> $@ + @echo '__dtb_$(*F)_begin:' >> $@ + @echo '.incbin "$<" ' >> $@ + @echo '__dtb_$(*F)_end:' >> $@ + @echo '.global __dtb_$(*F)_end' >> $@ + @echo '.balign DTB_ALIGNMENT' >> $@ + +DTC = $(objtree)/scripts/dtc/dtc + +quiet_cmd_dtc = DTC $@ + cmd_dtc = $(DTC) -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(src)/dts/$*.dts + +$(obj)/%.dtb: $(src)/dts/%.dts + $(call if_changed,dtc) # Bzip2 # ---------------------------------------------------------------------------