summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2016-05-29 07:38:02 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2016-05-29 07:38:02 +0000
commit80b370ad7459d94703d56e0dc400e1676762e25f (patch)
treef6304337fe48d3b91d8bd5e702b58a15a61a1b22 /etc
parent228200ab53cec001e672c0dc11bc727d0933ed88 (diff)
Stop building u-boot kernel and ramdisk images. The kernel make targets
are left for now but umg files are no longer built when building releases.
Diffstat (limited to 'etc')
-rw-r--r--etc/etc.armv7/Makefile.inc29
1 files changed, 3 insertions, 26 deletions
diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index 2b48a22b5e9..64f3867298c 100644
--- a/etc/etc.armv7/Makefile.inc
+++ b/etc/etc.armv7/Makefile.inc
@@ -1,33 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.13 2016/05/23 02:19:46 jsg Exp $
-
-ALLSOC=EXYNOS IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15
-MDEXT= bsd.rd BOOTARM.EFI
-
-.for SOC in ${ALLSOC}
-MDEXT+= bsd.${SOC}.umg
-MDEXT+= bsd.rd.${SOC}.umg
-.endfor
-
-KERNADDR_OMAP=0x80300000
-KERNADDR_IMX=0x10300000
-KERNADDR_SUNXI=0x40300000
-KERNADDR_VEXPRESSA15=0x80300000
-KERNADDR_VEXPRESSA9=0x60300000
-KERNADDR_EXYNOS=0x40300000
+# $OpenBSD: Makefile.inc,v 1.14 2016/05/29 07:38:01 jsg Exp $
bootblocks:
cp ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
-kernels: bootblocks ${ALL_KERNELS}
-.for CONF K in ${KERNELS}
- cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K
-.for SOC in ${ALLSOC}
- mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
- ${RELEASEDIR}/$K ${RELEASEDIR}/$K.${SOC}.umg
-.endfor
-.endfor
-
-MDEXT+= miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
+MDEXT= bsd.rd BOOTARM.EFI \
+ miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
miniroot-cubie-${OSrev}.fs miniroot-cubox-${OSrev}.fs \
miniroot-nitrogen-${OSrev}.fs miniroot-panda-${OSrev}.fs \
miniroot-wandboard-${OSrev}.fs