summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRaphael Graf <rapha@cvs.openbsd.org>2013-08-02 09:09:18 +0000
committerRaphael Graf <rapha@cvs.openbsd.org>2013-08-02 09:09:18 +0000
commit6bfd32acbbe617a1d23b5beb9cbd573a12eb14b3 (patch)
tree69c26074f5110b0518e03ae21fe95e84926930e0 /sys
parentb90512d7f16e43f772d304cf451ed476848a6941 (diff)
Drop the dependecy on objcopy.
ok florian@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/beagle/conf/Makefile.beagle17
1 files changed, 5 insertions, 12 deletions
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