Changeset fedac2f in mainline for boot

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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/ppc32/_link.ld.in (modified) (1 diff)
• arch/ppc32/include/arch.h (modified) (1 diff)
• arch/ppc32/src/main.c (modified) (1 diff)

boot/Makefile.common

@@ -74 +74 @@
         $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs
+        $(USPACE_PATH)/srv/vfs/vfs \
+        $(USPACE_PATH)/srv/logger/logger
 
 ifeq ($(RDFMT),tmpfs)
@@ -170 +171 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/loc/loc \
+        $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(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/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;