Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile

1 files changed, 278 insertions, 0 deletions

diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c
new file mode 100644
index 000000000000..ebeb6eb27907
--- /dev/null
+++ b/scripts/dtc/treesource.c
@@ -0,0 +1,278 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+#include "srcpos.h"
+
+extern FILE *yyin;
+extern int yyparse(void);
+
+struct boot_info *the_boot_info;
+int treesource_error;
+
+struct boot_info *dt_from_source(const char *fname)
+{
+        the_boot_info = NULL;
+        treesource_error = 0;
+
+        srcpos_file = dtc_open_file(fname, NULL);
+        yyin = srcpos_file->file;
+
+        if (yyparse() != 0)
+                die("Unable to parse input tree\n");
+
+        if (treesource_error)
+                die("Syntax error parsing input tree\n");
+
+        return the_boot_info;
+}
+
+static void write_prefix(FILE *f, int level)
+{
+        int i;
+
+        for (i = 0; i < level; i++)
+                fputc('\t', f);
+}
+
+int isstring(char c)
+{
+        return (isprint(c)
+                || (c == '\0')
+                || strchr("\a\b\t\n\v\f\r", c));
+}
+
+static void write_propval_string(FILE *f, struct data val)
+{
+        const char *str = val.val;
+        int i;
+        int newchunk = 1;
+        struct marker *m = val.markers;
+
+        assert(str[val.len-1] == '\0');
+
+        for (i = 0; i < (val.len-1); i++) {
+                char c = str[i];
+
+                if (newchunk) {
+                        while (m && (m->offset <= i)) {
+                                if (m->type == LABEL) {
+                                        assert(m->offset == i);
+                                        fprintf(f, "%s: ", m->ref);
+                                }
+                                m = m->next;
+                        }
+                        fprintf(f, "\"");
+                        newchunk = 0;
+                }
+
+                switch (c) {
+                case '\a':
+                        fprintf(f, "\\a");
+                        break;
+                case '\b':
+                        fprintf(f, "\\b");
+                        break;
+                case '\t':
+                        fprintf(f, "\\t");
+                        break;
+                case '\n':
+                        fprintf(f, "\\n");
+                        break;
+                case '\v':
+                        fprintf(f, "\\v");
+                        break;
+                case '\f':
+                        fprintf(f, "\\f");
+                        break;
+                case '\r':
+                        fprintf(f, "\\r");
+                        break;
+                case '\\':
+                        fprintf(f, "\\\\");
+                        break;
+                case '\"':
+                        fprintf(f, "\\\"");
+                        break;
+                case '\0':
+                        fprintf(f, "\", ");
+                        newchunk = 1;
+                        break;
+                default:
+                        if (isprint(c))
+                                fprintf(f, "%c", c);
+                        else
+                                fprintf(f, "\\x%02hhx", c);
+                }
+        }
+        fprintf(f, "\"");
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m, LABEL) {
+                assert (m->offset == val.len);
+                fprintf(f, " %s:", m->ref);
+        }
+}
+
+static void write_propval_cells(FILE *f, struct data val)
+{
+        void *propend = val.val + val.len;
+        cell_t *cp = (cell_t *)val.val;
+        struct marker *m = val.markers;
+
+        fprintf(f, "<");
+        for (;;) {
+                while (m && (m->offset <= ((char *)cp - val.val))) {
+                        if (m->type == LABEL) {
+                                assert(m->offset == ((char *)cp - val.val));
+                                fprintf(f, "%s: ", m->ref);
+                        }
+                        m = m->next;
+                }
+
+                fprintf(f, "0x%x", fdt32_to_cpu(*cp++));
+                if ((void *)cp >= propend)
+                        break;
+                fprintf(f, " ");
+        }
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m, LABEL) {
+                assert (m->offset == val.len);
+                fprintf(f, " %s:", m->ref);
+        }
+        fprintf(f, ">");
+}
+
+static void write_propval_bytes(FILE *f, struct data val)
+{
+        void *propend = val.val + val.len;
+        const char *bp = val.val;
+        struct marker *m = val.markers;
+
+        fprintf(f, "[");
+        for (;;) {
+                while (m && (m->offset == (bp-val.val))) {
+                        if (m->type == LABEL)
+                                fprintf(f, "%s: ", m->ref);
+                        m = m->next;
+                }
+
+                fprintf(f, "%02hhx", *bp++);
+                if ((const void *)bp >= propend)
+                        break;
+                fprintf(f, " ");
+        }
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m, LABEL) {
+                assert (m->offset == val.len);
+                fprintf(f, " %s:", m->ref);
+        }
+        fprintf(f, "]");
+}
+
+static void write_propval(FILE *f, struct property *prop)
+{
+        int len = prop->val.len;
+        const char *p = prop->val.val;
+        struct marker *m = prop->val.markers;
+        int nnotstring = 0, nnul = 0;
+        int nnotstringlbl = 0, nnotcelllbl = 0;
+        int i;
+
+        if (len == 0) {
+                fprintf(f, ";\n");
+                return;
+        }
+
+        for (i = 0; i < len; i++) {
+                if (! isstring(p[i]))
+                        nnotstring++;
+                if (p[i] == '\0')
+                        nnul++;
+        }
+
+        for_each_marker_of_type(m, LABEL) {
+                if ((m->offset > 0) && (prop->val.val[m->offset - 1] != '\0'))
+                        nnotstringlbl++;
+                if ((m->offset % sizeof(cell_t)) != 0)
+                        nnotcelllbl++;
+        }
+
+        fprintf(f, " = ");
+        if ((p[len-1] == '\0') && (nnotstring == 0) && (nnul < (len-nnul))
+            && (nnotstringlbl == 0)) {
+                write_propval_string(f, prop->val);
+        } else if (((len % sizeof(cell_t)) == 0) && (nnotcelllbl == 0)) {
+                write_propval_cells(f, prop->val);
+        } else {
+                write_propval_bytes(f, prop->val);
+        }
+
+        fprintf(f, ";\n");
+}
+
+static void write_tree_source_node(FILE *f, struct node *tree, int level)
+{
+        struct property *prop;
+        struct node *child;
+
+        write_prefix(f, level);
+        if (tree->label)
+                fprintf(f, "%s: ", tree->label);
+        if (tree->name && (*tree->name))
+                fprintf(f, "%s {\n", tree->name);
+        else
+                fprintf(f, "/ {\n");
+
+        for_each_property(tree, prop) {
+                write_prefix(f, level+1);
+                if (prop->label)
+                        fprintf(f, "%s: ", prop->label);
+                fprintf(f, "%s", prop->name);
+                write_propval(f, prop);
+        }
+        for_each_child(tree, child) {
+                fprintf(f, "\n");
+                write_tree_source_node(f, child, level+1);
+        }
+        write_prefix(f, level);
+        fprintf(f, "};\n");
+}
+
+
+void dt_to_source(FILE *f, struct boot_info *bi)
+{
+        struct reserve_info *re;
+
+        fprintf(f, "/dts-v1/;\n\n");
+
+        for (re = bi->reservelist; re; re = re->next) {
+                if (re->label)
+                        fprintf(f, "%s: ", re->label);
+                fprintf(f, "/memreserve/\t0x%016llx 0x%016llx;\n",
+                        (unsigned long long)re->re.address,
+                        (unsigned long long)re->re.size);
+        }
+
+        write_tree_source_node(f, bi->dt, 0);
+}
+