diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2013-09-07 23:04:45 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2013-09-07 23:04:45 +0000 |
| commit | 1d12f2d42a1c82972e485119892dc4dde41c6519 (patch) | |
| tree | f796fe32e52937ab06b9bcffe2c368f12c7f7728 /distrib | |
| parent | 78ea0c7ac8df3027cf92c5e06621cf0be2f8be10 (diff) | |
Update ARMv7's release build process to build kernels and ramdisks
per SoC. It's heavily based on the SGI port.
ok florian@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/armv7/miniroot/Makefile.inc | 4 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/Makefile | 36 |
2 files changed, 24 insertions, 16 deletions
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index 6891d676239..018ed3b257f 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -1,6 +1,6 @@ REV= ${OSrev} -BSD_RD= bsd.rd +BSD_RD= bsd.rd.OMAP IMAGE= miniroot-${BOARD}-${REV}.fs @@ -36,7 +36,7 @@ do_files: mkdir ${MOUNT_POINT}/u-boots cp -r /usr/mdec/{am335x,beagle,panda} ${MOUNT_POINT}/u-boots mkuboot -a arm -o linux -e 0x80300000 -l 0x80300000 \ - ${.OBJDIR}/../../ramdisk/bsd.rd ${MOUNT_POINT}/bsd.umg + ${.OBJDIR}/../../ramdisk/bsd.rd.OMAP ${MOUNT_POINT}/bsd.umg rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile index 8c24783b823..eaba79893dc 100644 --- a/distrib/armv7/ramdisk/Makefile +++ b/distrib/armv7/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2013/09/04 20:00:22 patrick Exp $ +# $OpenBSD: Makefile,v 1.2 2013/09/07 23:04:44 patrick Exp $ REV= ${OSrev} @@ -33,23 +33,31 @@ all ${IMAGE}: @false .else -# mix config is not needed. -all: ${BSD_RD} +ALLSOC= IMX OMAP +ALLBDS= +ALLBSDRD= +.for SOC in ${ALLSOC} +ALLBSD+= bsd.${SOC} +ALLBSDRD+= ${BSD_RD}.${SOC} +all: ${ALLBSDRD} +.endfor + +.for SOC in ${ALLSOC} +bsd.${SOC}: + cd ${TOP}/../../sys/arch/armv7/conf && config RAMDISK-${SOC} + cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK-${SOC} && \ + ${MAKE} clean && exec ${MAKE} + cp ${TOP}/../../sys/arch/armv7/compile/RAMDISK-${SOC}/bsd bsd.${SOC} -${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot - cp bsd ${BSD_RD} - ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE} +${BSD_RD}.${SOC}: ${CBIN} ${IMAGE} bsd.${SOC} rdsetroot + cp bsd.${SOC} ${BSD_RD}.${SOC} + ${.OBJDIR}/rdsetroot ${BSD_RD}.${SOC} ${IMAGE} +.endfor ${IMAGE}: rd_setup do_files rd_teardown .endif -bsd: - cd ${TOP}/../../sys/arch/armv7/conf && config RAMDISK-OMAP - cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK-OMAP && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/armv7/compile/RAMDISK-OMAP/bsd bsd - rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} vnconfig -v -c ${VND} ${IMAGE} @@ -92,13 +100,13 @@ do_files: clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - *.o *.lo *.c bsd ${BSD_RD} rdsetroot + *.o *.lo *.c ${ALLBSD} ${ALLBSDRD} rdsetroot rm -f instbin.conf rm -rf cd-dir .ifdef RELEASEDIR install: - cp ${BSD_RD} ${RELEASEDIR} + cp ${ALLBSDRD} ${RELEASEDIR} .endif # RELEASEDIR .include <bsd.obj.mk> |