diff options
| author |   rapha <rapha@openbsd.org> | 2013-08-02 09:09:17 +0000 |
|---|---|---|
| committer | rapha <rapha@openbsd.org> | 2013-08-02 09:09:17 +0000 |
| commit | eb9d282c9a2b2931e745038a4ccaa1e8434f82e3 (patch) | |
| tree | 4b8e7fb642a718b951fe2b10ccd58b6dab75b6d7 | |
| parent | regen (diff) | |
| download | wireguard-openbsd-eb9d282c9a2b2931e745038a4ccaa1e8434f82e3.tar.xz wireguard-openbsd-eb9d282c9a2b2931e745038a4ccaa1e8434f82e3.zip | |
Drop the dependecy on objcopy.
ok florian@
| -rw-r--r-- | distrib/beagle/miniroot/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/beagle/conf/Makefile.beagle | 17 |
2 files changed, 6 insertions, 15 deletions
diff --git a/distrib/beagle/miniroot/Makefile.inc b/distrib/beagle/miniroot/Makefile.inc index 370271bb2ac..6891d676239 100644 --- a/distrib/beagle/miniroot/Makefile.inc +++ b/distrib/beagle/miniroot/Makefile.inc @@ -35,10 +35,8 @@ do_files: cp /usr/mdec/${BOARD}/u-boot.* ${MOUNT_POINT}/ mkdir ${MOUNT_POINT}/u-boots cp -r /usr/mdec/{am335x,beagle,panda} ${MOUNT_POINT}/u-boots - objcopy -O binary ${.OBJDIR}/../../ramdisk/bsd.rd \ - ${.OBJDIR}/bsdrd.img mkuboot -a arm -o linux -e 0x80300000 -l 0x80300000 \ - ${.OBJDIR}/bsdrd.img ${MOUNT_POINT}/bsd.umg + ${.OBJDIR}/../../ramdisk/bsd.rd ${MOUNT_POINT}/bsd.umg rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index 6ff4082a48a..a8f4734a17b 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.44 2013/06/23 20:33:51 miod Exp $ +# $OpenBSD: Makefile.beagle,v 1.45 2013/08/02 09:09:17 rapha Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -55,8 +55,6 @@ NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< -OBJCOPY?= objcopy - %OBJS %CFILES @@ -177,17 +175,12 @@ install-kernel-${MACHINE_NAME}: # until we get native booting working, put this in the tree. -bsdrd.img: bsd.rd - ${OBJCOPY} -O binary bsd.rd bsdrd.img - -bsd.img: bsd - ${OBJCOPY} -O binary bsd bsd.img -bsdrd.umg: bsdrd.img - mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsdrd.img bsdrd.umg +bsdrd.umg: bsd.rd + mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsd.rd bsdrd.umg -bsd.umg: bsd.img - mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsd.img bsd.umg +bsd.umg: bsd + mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsd bsd.umg bsd.rd: bsd cp bsd bsd.rd |