Changeset 8f88beb7 in mainline for boot

Timestamp:

2012-11-25T21:34:07Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e1a27be

Parents:

150a2718 (diff), 7462674 (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/ia64/src/main.c (modified) (1 diff)

boot/Makefile.common

@@ -109 +109 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/udf/udf \
-        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
@@ -167 +166 @@
         $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/ext2info/ext2info \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \

boot/arch/ia64/src/main.c

@@ -48 +48 @@
 
 #define DEFAULT_MEMORY_BASE             0x4000000ULL
-#define DEFAULT_MEMORY_SIZE             0x4000000ULL
+#define DEFAULT_MEMORY_SIZE             (256 * 1024 * 1024)
 #define DEFAULT_LEGACY_IO_BASE          0x00000FFFFC000000ULL
 #define DEFAULT_LEGACY_IO_SIZE          0x4000000ULL