From: Simon Glass Date: Sat, 15 Oct 2011 05:48:20 +0000 (+0000) Subject: fdt: ARM: Add device tree control of U-Boot (CONFIG_OF_CONTROL) X-Git-Tag: v2011.12-rc1~415 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45ba8077f3ed7039b6cde5fe56149d390dc5ff0c;p=oweals%2Fu-boot.git 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 --- diff --git a/README b/README index 2dde0661c8..d618957eae 100644 --- a/README +++ b/README @@ -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 fac98d559a..c3ff789999 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)