From e4f880eddde5406fc9dd1edf7e6a49422f3d8e7b Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 11 Jan 2006 13:49:31 -0600 Subject: Added CONFIG_ options for bd_t and env in flat dev tree CONFIG_OF_HAS_BD_T will put a copy of the bd_t into the resulting flat device tree. CONFIG_OF_HAS_UBOOT_ENV will copy the environment variables from u-boot into the flat device tree Patch by Kumar Gala 11 Jan 2006 --- README | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'README') diff --git a/README b/README index 6f61008222..21f5bf049e 100644 --- a/README +++ b/README @@ -413,6 +413,16 @@ The following options need to be configured: OF_CPU - The proper name of the cpus node. OF_TBCLK - The timebase frequency. + CONFIG_OF_HAS_BD_T + + The resulting flat device tree will have a copy of the bd_t. + Space should be pre-allocated in the dts for the bd_t. + + CONFIG_OF_HAS_UBOOT_ENV + + The resulting flat device tree will have a copy of u-boot's + environment variables + - Serial Ports: CFG_PL010_SERIAL -- cgit v1.2.3 From 4e2531378f03957d7306e940e0bc21de103f40d3 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 11 Jan 2006 13:54:17 -0600 Subject: Allow board code to fixup the flat device tree before booting a kernel Patch by Kumar Gala 11 Jan 2006 --- CHANGELOG | 4 ++++ README | 5 +++++ common/ft_build.c | 5 ++++- include/ft_build.h | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) (limited to 'README') diff --git a/CHANGELOG b/CHANGELOG index 2bdaa0cbc0..a2c01fbb38 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,10 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Allow board code to fixup the flat device tree before booting a + kernel + Patch by Kumar Gala 11 Jan 2006 + * Added CONFIG_ options for bd_t and env in flat dev tree CONFIG_OF_HAS_BD_T will put a copy of the bd_t diff --git a/README b/README index 21f5bf049e..3b64fe20a1 100644 --- a/README +++ b/README @@ -423,6 +423,11 @@ The following options need to be configured: The resulting flat device tree will have a copy of u-boot's environment variables + CONFIG_OF_BOARD_SETUP + + Board code has addition modification that it wants to make + to the flat device tree before handing it off to the kernel + - Serial Ports: CFG_PL010_SERIAL diff --git a/common/ft_build.c b/common/ft_build.c index 57194581a1..2cecbcf966 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -698,9 +698,12 @@ void ft_setup(void *blob, int size, bd_t * bd) if (p != NULL) *p = cpu_to_be32(clock); #endif - #endif /* __powerpc__ */ +#ifdef CONFIG_OF_BOARD_SETUP + ft_board_setup(blob, bd); +#endif + /* printf("final OF-tree\n"); ft_dump_blob(blob); diff --git a/include/ft_build.h b/include/ft_build.h index 9104b1a555..a276867c5d 100644 --- a/include/ft_build.h +++ b/include/ft_build.h @@ -63,4 +63,6 @@ void ft_dump_blob(const void *bphp); void ft_merge_blob(struct ft_cxt *cxt, void *blob); void *ft_get_prop(void *bphp, const char *propname, int *szp); +void ft_board_setup(void *blob, bd_t *bd); + #endif -- cgit v1.2.3 From c2871f038062abafa0b7f2048075098915a5ba41 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 11 Jan 2006 13:59:02 -0600 Subject: Added OF_STDOUT_PATH and OF_SOC OF_STDOUT_PATH specifies the path to the device the kernel can use for console output OF_SOC specifies the proper name of the SOC node if one exists. Patch by Kumar Gala 11 Jan 2006 --- CHANGELOG | 8 ++++++++ README | 2 ++ common/ft_build.c | 3 +++ 3 files changed, 13 insertions(+) (limited to 'README') diff --git a/CHANGELOG b/CHANGELOG index a2c01fbb38..7c201433ce 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,14 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Added OF_STDOUT_PATH and OF_SOC + + OF_STDOUT_PATH specifies the path to the device the kernel can use + for console output + + OF_SOC specifies the proper name of the SOC node if one exists. + Patch by Kumar Gala 11 Jan 2006 + * Allow board code to fixup the flat device tree before booting a kernel Patch by Kumar Gala 11 Jan 2006 diff --git a/README b/README index 3b64fe20a1..ecaef9e153 100644 --- a/README +++ b/README @@ -411,7 +411,9 @@ The following options need to be configured: The maximum size of the constructed OF tree. OF_CPU - The proper name of the cpus node. + OF_SOC - The proper name of the soc node. OF_TBCLK - The timebase frequency. + OF_STDOUT_PATH - The path to the console device CONFIG_OF_HAS_BD_T diff --git a/common/ft_build.c b/common/ft_build.c index 2cecbcf966..7a9a40a305 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -645,6 +645,9 @@ void ft_setup(void *blob, int size, bd_t * bd) ft_prop_str(&cxt, "name", "chosen"); ft_prop_str(&cxt, "bootargs", getenv("bootargs")); ft_prop_int(&cxt, "linux,platform", 0x600); /* what is this? */ +#ifdef OF_STDOUT_PATH + ft_prop_str(&cxt, "linux,stdout-path", OF_STDOUT_PATH); +#endif ft_end_node(&cxt); -- cgit v1.2.3