Changeset 70253688 in mainline for boot

Timestamp:

2012-09-07T08:12:05Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/arm32/include/main.h (modified) (1 diff)
• arch/ppc32/_link.ld.in (modified) (1 diff)
• arch/ppc32/include/arch.h (modified) (1 diff)
• arch/ppc32/src/main.c (modified) (1 diff)
• generic/include/printf.h (modified) (1 diff)
• generic/include/printf_verify.h (added)

boot/Makefile.common

@@ -108 +108 @@
         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
+        $(USPACE_PATH)/srv/fs/udf/udf \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
@@ -174 +175 @@
         $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
-        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \

boot/arch/arm32/include/main.h

@@ -52 +52 @@
 
 /** GXemul testarm serial console output register */
-#define TESTARM_SCONS_ADDR      0x10000000
+#define TESTARM_SCONS_ADDR      0x10000000
 
 /** IntegratorCP serial console output register */
-#define ICP_SCONS_ADDR          0x16000000
+#define ICP_SCONS_ADDR          0x16000000
 
 extern void bootstrap(void);

boot/arch/ppc32/_link.ld.in

@@ -2 +2 @@
 
 SECTIONS {
-        . = 0x01000000;
+        . = 0x02000000;
         .text : {
                 *(BOOTSTRAP);

boot/arch/ppc32/include/arch.h

@@ -35 +35 @@
 #define BOOT_OFFSET  0x8000
 
-#define LOADER_ADDRESS  0x01000000
+#define LOADER_ADDRESS  0x02000000
 
 #ifndef __ASM__

boot/arch/ppc32/src/main.c

@@ -103 +103 @@
         }
         
+        if (top >= (size_t) loader_address_pa) {
+                printf("Inflated components overlap loader area.\n");
+                printf("The boot image is too large. Halting.\n");
+                halt();
+        }
+        
         void *balloc_base;
         void *balloc_base_pa;

boot/generic/include/printf.h

@@ -35 +35 @@
 #include <typedefs.h>
 #include <stdarg.h>
-
-#ifndef NVERIFY_PRINTF
-
-#define PRINTF_ATTRIBUTE(start, end) \
-        __attribute__((format(gnu_printf, start, end)))
-
-#else /* NVERIFY_PRINTF */
-
-#define PRINTF_ATTRIBUTE(start, end)
-
-#endif /* NVERIFY_PRINTF */
+#include <printf_verify.h>
 
 #define EOF  (-1)