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

diff --git a/CHANGELOG b/CHANGELOG
index c1da98fc510ff38ad2ab83cdfd3b759848990631..2bdaa0cbc054d5f2a47c5c9e9829df837ecd4335 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,16 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* 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
+
 * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
 
 * Fix compiler problem with at91rm9200dk board.

diff --git a/README b/README
index 6f610082224e54fc0a31246cdea7ad688df1e6d1..21f5bf049e1206bbbeef79eff81527fee7aa41c8 100644 (file)
--- 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
 

diff --git a/common/ft_build.c b/common/ft_build.c
index 65a274f84087eea80f94d76b4f9987a081845617..57194581a10e64980349a61b8f013757766bc0dc 100644 (file)
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -529,6 +529,7 @@ extern uchar(*env_get_char) (int);
 
 #define BDM(x) {       .name = #x, .offset = offsetof(bd_t, bi_ ##x ) }
 
+#ifdef CONFIG_OF_HAS_BD_T
 static const struct {
        const char *name;
        int offset;
@@ -574,19 +575,24 @@ static const struct {
 #endif
        BDM(baudrate),
 };
+#endif
 
 void ft_setup(void *blob, int size, bd_t * bd)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-       u8 *end;
        u32 *p;
        int len;
        struct ft_cxt cxt;
-       int i, k, nxt;
-       static char tmpenv[256];
-       char *s, *lval, *rval;
        ulong clock;
-       uint32_t v;
+#if defined(CONFIG_OF_HAS_UBOOT_ENV)
+       int k, nxt;
+#endif
+#if defined(CONFIG_OF_HAS_BD_T)
+       u8 *end;
+#endif
+#if defined(CONFIG_OF_HAS_UBOOT_ENV) || defined(CONFIG_OF_HAS_BD_T)
+       int i;
+       static char tmpenv[256];
+#endif
 
        /* disable OF tree; booting old kernel */
        if (getenv("disable_of") != NULL) {
@@ -610,9 +616,12 @@ void ft_setup(void *blob, int size, bd_t * bd)
        /* back into root */
        ft_backtrack_node(&cxt);
 
+#ifdef CONFIG_OF_HAS_UBOOT_ENV
        ft_begin_node(&cxt, "u-boot-env");
 
        for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
+               char *s, *lval, *rval;
+
                for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) ;
                s = tmpenv;
                for (k = i; k < nxt && s < &tmpenv[sizeof(tmpenv) - 1]; ++k)
@@ -629,6 +638,7 @@ void ft_setup(void *blob, int size, bd_t * bd)
        }
 
        ft_end_node(&cxt);
+#endif
 
        ft_begin_node(&cxt, "chosen");
 
@@ -647,14 +657,19 @@ void ft_setup(void *blob, int size, bd_t * bd)
           ft_dump_blob(blob);
         */
 
+#ifdef CONFIG_OF_HAS_BD_T
        /* paste the bd_t at the end of the flat tree */
        end = (char *)blob +
            be32_to_cpu(((struct boot_param_header *)blob)->totalsize);
        memcpy(end, bd, sizeof(*bd));
+#endif
 
 #ifdef CONFIG_PPC
 
+#ifdef CONFIG_OF_HAS_BD_T
        for (i = 0; i < sizeof(bd_map)/sizeof(bd_map[0]); i++) {
+               uint32_t v;
+
                sprintf(tmpenv, "/bd_t/%s", bd_map[i].name);
                v = *(uint32_t *)((char *)bd + bd_map[i].offset);
 
@@ -670,6 +685,7 @@ void ft_setup(void *blob, int size, bd_t * bd)
        p = ft_get_prop(blob, "/bd_t/ethspeed", &len);
        if (p != NULL)
                *p = cpu_to_be32((uint32_t) bd->bi_ethspeed);
+#endif
 
        clock = bd->bi_intfreq;
        p = ft_get_prop(blob, "/cpus/" OF_CPU "/clock-frequency", &len);
@@ -680,7 +696,7 @@ void ft_setup(void *blob, int size, bd_t * bd)
        clock = OF_TBCLK;
        p = ft_get_prop(blob, "/cpus/" OF_CPU "/timebase-frequency", &len);
        if (p != NULL)
-               *p = cpu_to_be32(OF_TBCLK);
+               *p = cpu_to_be32(clock);
 #endif
 
 #endif                         /* __powerpc__ */

diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index 3ffe6b2e05f429aeea8443f51821f143cc12fc39..be6c36cac9da323701faa0ea461db0efb520ef71 100644 (file)
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -584,5 +584,7 @@ typedef unsigned int led_id_t;
 
 #define OF_CPU                 "PowerPC,MPC870@0"
 #define OF_TBCLK               (MPC8XX_HZ / 16)
+#define CONFIG_OF_HAS_BD_T     1
+#define CONFIG_OF_HAS_UBOOT_ENV        1
 
 #endif /* __CONFIG_H */