summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Mercer <bmercer@cvs.openbsd.org>2013-06-06 19:09:55 +0000
committerBrandon Mercer <bmercer@cvs.openbsd.org>2013-06-06 19:09:55 +0000
commit4a96331cfe4412da6a7ab263e8a53fb4630ae669 (patch)
tree1ce3cfe502627c84335c1ff4ca77e4bf352db2bc
parentc65d3ec2c0d2819b2c3d07a7f719a4b003f2f20b (diff)
Update the miniroot to install some other needed files. Much collaboration and
OK florian@
-rw-r--r--distrib/beagle/miniroot/Makefile.inc15
1 files changed, 8 insertions, 7 deletions
diff --git a/distrib/beagle/miniroot/Makefile.inc b/distrib/beagle/miniroot/Makefile.inc
index eead170f18e..9daa2df49a1 100644
--- a/distrib/beagle/miniroot/Makefile.inc
+++ b/distrib/beagle/miniroot/Makefile.inc
@@ -29,14 +29,15 @@ ${IMAGE}: rd_setup do_files rd_teardown
.endif
-bsd:
- objcopy -O binary ${.CURDIR}/../../ramdisk/obj/bsd.rd \
- ${.CURDIR}/bsd.rd.img
+do_files:
+ cp ${.OBJDIR}/../../../../sys/arch/beagle/stand/boot.scr/boot.scr \
+ ${MOUNT_POINT}/boot.scr
+ cp /usr/mdec/${BOARD}/mlo ${MOUNT_POINT}/mlo
+ cp /usr/mdec/${BOARD}/u-boot.bin ${MOUNT_POINT}/u-boot.bin
+ objcopy -O binary ${.OBJDIR}/../../ramdisk/bsd.rd \
+ ${.OBJDIR}/bsdrd.img
mkuboot -a arm -o linux -e 0x80300000 -l 0x80300000 \
- ${.CURDIR}/bsd.rd.img ${.CURDIR}/bsd
-
-do_files: bsd
- cp ${.CURDIR}/bsd ${MOUNT_POINT}/bsd.umg
+ ${.OBJDIR}/bsdrd.img ${MOUNT_POINT}/bsd.umg
rd_setup:
dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}