Merge commit 'main-jb-2012.08.03-B4' into t114-0806
[linux-2.6.git] / arch / arm / boot / compressed / atags_to_fdt.c
index 797f04b..e7a26fe 100644 (file)
@@ -89,6 +89,11 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
                                        initrd_start);
                        setprop_cell(fdt, "/chosen", "linux,initrd-end",
                                        initrd_start + initrd_size);
+               } else if (atag->hdr.tag == ATAG_SERIAL) {
+                       uint32_t serial[2];
+                       serial[0] = cpu_to_fdt32(atag->u.serialnr.high);
+                       serial[1] = cpu_to_fdt32(atag->u.serialnr.low);
+                       setprop(fdt, "/", "serial-num", serial, 8);
                }
        }