Changeset 30413b31 in mainline for boot

Timestamp:

2011-12-10T08:29:44Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d9f8dd13

Parents:

b8b1e631 (diff), 87955bfb (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 with mainline

Location:

boot

Files:

• Makefile.common (modified) (1 diff)
• Makefile.grub (modified) (1 diff)

boot/Makefile.common

@@ -179 +179 @@
         $(USPACE_PATH)/app/nettest1/nettest1 \
         $(USPACE_PATH)/app/nettest2/nettest2 \
+        $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
         $(USPACE_PATH)/app/ping/ping \

boot/Makefile.grub

@@ -89 +89 @@
                         echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
                 else \
-                        echo "  $(MODULE_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
+                        echo "  $(MODULE_CMD) /boot/$$module /boot/$$module" >> $(BOOT_CONFIG) ; \
                 fi \
         done