Patchwork [U-Boot,v6,1/6] fdt: ARM: Add device tree control of U-Boot (CONFIG_OF_CONTROL)

login
register
mail settings
Submitter Simon Glass
Date Oct. 25, 2011, 5:15 a.m.
Message ID <1319519734-28704-2-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/121493/
State New, archived
Headers show

Comments

Simon Glass - Oct. 25, 2011, 5:15 a.m.
This adds a device tree pointer to the global data. It can be set by
board code. A later commit will add support for making a device
tree binary blob available to U-Boot for run-time configuration.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3:
- Rename gd->blob to gd->fdt_blob

Changes in v4:
- Fix reference to gd->blob which should be gd->fdt_blob

 README                             |   11 +++++++++++
 arch/arm/include/asm/global_data.h |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)
Wolfgang Denk - Oct. 26, 2011, 7:38 p.m.
Dear Simon Glass,

In message <1319519734-28704-2-git-send-email-sjg@chromium.org> you wrote:
> This adds a device tree pointer to the global data. It can be set by
> board code. A later commit will add support for making a device
> tree binary blob available to U-Boot for run-time configuration.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> Changes in v3:
> - Rename gd->blob to gd->fdt_blob
> 
> Changes in v4:
> - Fix reference to gd->blob which should be gd->fdt_blob
> 
>  README                             |   11 +++++++++++
>  arch/arm/include/asm/global_data.h |    1 +
>  2 files changed, 12 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/README b/README
index c6b179c..f424b28 100644
--- a/README
+++ b/README
@@ -815,6 +815,17 @@  The following options need to be configured:
 
 		XXX - this list needs to get updated!
 
+- Device tree:
+		CONFIG_OF_CONTROL
+		If this variable is defined, U-Boot will use a device tree
+		to configure its devices, instead of relying on statically
+		compiled #defines in the board file. This option is
+		experimental and only available on a few boards. The device
+		tree is available in the global data as gd->fdt_blob.
+
+		U-Boot needs to get its device tree from somewhere. This will
+		be enabled in a future patch.
+
 - Watchdog:
 		CONFIG_WATCHDOG
 		If this variable is defined, it enables watchdog
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index fac98d5..c3ff789 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -76,6 +76,7 @@  typedef	struct	global_data {
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
 	unsigned long	tlb_addr;
 #endif
+	const void	*fdt_blob;	/* Our device tree, NULL if none */
 	void		**jt;		/* jump table */
 	char		env_buf[32];	/* buffer for getenv() before reloc. */
 #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)