Changeset 5828554 in mainline for boot/arch/arm32/src/mm.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/arm32/src/mm.c (modified) (1 diff)

boot/arch/arm32/src/mm.c

@@ -116 +116 @@
         if (address >= AM335x_RAM_START && address < AM335x_RAM_END)
                 return 1;
+#elif defined MACHINE_raspberrypi
+        if (address < BCM2835_RAM_END)
+                return 1;
 #endif
         return address * 0;