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

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (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:

Merge mainline changes

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;