Module Name: src
Committed By: matt
Date: Sat Sep 27 04:03:25 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: NITROGEN6X mk.nitrogen6
Added Files:
src/sys/arch/evbarm/conf: NITROGEN6X_INSTALL
Log Message:
Add INSTALL kernel. Fix .ub generation.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/NITROGEN6X \
src/sys/arch/evbarm/conf/mk.nitrogen6
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.1 src/sys/arch/evbarm/conf/NITROGEN6X:1.2
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.1 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/evbarm/conf/NITROGEN6X Sat Sep 27 04:03:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.1 2014/09/25 05:05:28 ryo Exp $
+# $NetBSD: NITROGEN6X,v 1.2 2014/09/27 04:03:24 matt Exp $
#
# Nitrogen6X
# - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -339,10 +339,6 @@ pseudo-device raid # RAIDframe disk dr
pseudo-device fss # file system snapshot device
pseudo-device putter # for puffs and pud
-pseudo-device md # memory disk device (ramdisk)
-options MEMORY_DISK_HOOKS # enable root ramdisk
-options MEMORY_DISK_DYNAMIC # loaded via kernel module(7)
-
pseudo-device vnd # disk-like interface to files
options VND_COMPRESSION # compressed vnd(4)
Index: src/sys/arch/evbarm/conf/mk.nitrogen6
diff -u src/sys/arch/evbarm/conf/mk.nitrogen6:1.1 src/sys/arch/evbarm/conf/mk.nitrogen6:1.2
--- src/sys/arch/evbarm/conf/mk.nitrogen6:1.1 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/evbarm/conf/mk.nitrogen6 Sat Sep 27 04:03:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mk.nitrogen6,v 1.1 2014/09/25 05:05:28 ryo Exp $
+# $NetBSD: mk.nitrogen6,v 1.2 2014/09/27 04:03:24 matt Exp $
SYSTEM_FIRST_OBJ= nitrogen6_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/nitrogen6/nitrogen6_start.S
@@ -19,5 +19,15 @@ MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
+ echo ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
+ ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+ echo
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
Added files:
Index: src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL
diff -u /dev/null src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL:1.1
--- /dev/null Sat Sep 27 04:03:25 2014
+++ src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL Sat Sep 27 04:03:24 2014
@@ -0,0 +1,9 @@
+# $NetBSD: NITROGEN6X_INSTALL,v 1.1 2014/09/27 04:03:24 matt Exp $
+#
+# NITROGEN6X_INSTALL -- NITROGEN6X kernel with installation-sized
+# ramdisk
+#
+
+include "arch/evbarm/conf/NITROGEN6X"
+include "arch/evbarm/conf/INSTALL"
+no makeoptions DEBUG
