diff options
author | Simon Glass <sjg@chromium.org> | 2011-10-15 05:48:20 +0000 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-10-26 21:37:17 +0200 |
commit | 45ba8077f3ed7039b6cde5fe56149d390dc5ff0c (patch) | |
tree | 808ca20d09508fc6493b9143d1e84282e0d38788 | |
parent | 2d46cf291eae29a42bb5ca3d280d2b136339686b (diff) | |
download | u-boot-imx-45ba8077f3ed7039b6cde5fe56149d390dc5ff0c.zip u-boot-imx-45ba8077f3ed7039b6cde5fe56149d390dc5ff0c.tar.gz u-boot-imx-45ba8077f3ed7039b6cde5fe56149d390dc5ff0c.tar.bz2 |
fdt: ARM: Add device tree control of U-Boot (CONFIG_OF_CONTROL)
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>
-rw-r--r-- | README | 11 | ||||
-rw-r--r-- | arch/arm/include/asm/global_data.h | 1 |
2 files changed, 12 insertions, 0 deletions
@@ -816,6 +816,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) |