Changeset e3bc355 in mainline for boot/arch/mips32/include/types.h

Timestamp:

2013-07-28T23:07:18Z (13 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2b55edb

Parents:

283ea3d (diff), ccdc63e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline merge

File:

• boot/arch/mips32/include/types.h (modified) (1 diff)

boot/arch/mips32/include/types.h

@@ -47 +47 @@
 
 typedef struct {
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        uint32_t sdram_size;
+#endif
         uint32_t cpumap;
         size_t cnt;