Module Name: src
Committed By: christos
Date: Sat Feb 17 15:08:32 UTC 2024
Modified Files:
src/sys/arch/evbarm/conf: mk.altera mk.bcm53xx mk.generic mk.generic64
mk.gumstix mk.integrator_cp mk.kobo mk.marvell mk.mv2120 mk.ti
Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.altera
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/mk.bcm53xx \
src/sys/arch/evbarm/conf/mk.generic64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/mk.generic
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/mk.gumstix
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.integrator_cp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.kobo \
src/sys/arch/evbarm/conf/mk.mv2120
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.marvell
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.ti
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/mk.altera
diff -u src/sys/arch/evbarm/conf/mk.altera:1.3 src/sys/arch/evbarm/conf/mk.altera:1.4
--- src/sys/arch/evbarm/conf/mk.altera:1.3 Thu Oct 18 05:01:54 2018
+++ src/sys/arch/evbarm/conf/mk.altera Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.altera,v 1.3 2018/10/18 09:01:54 skrll Exp $
+# $NetBSD: mk.altera,v 1.4 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -14,6 +14,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel -O linux
MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.bcm53xx
diff -u src/sys/arch/evbarm/conf/mk.bcm53xx:1.6 src/sys/arch/evbarm/conf/mk.bcm53xx:1.7
--- src/sys/arch/evbarm/conf/mk.bcm53xx:1.6 Mon Jan 21 02:26:14 2019
+++ src/sys/arch/evbarm/conf/mk.bcm53xx Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.bcm53xx,v 1.6 2019/01/21 07:26:14 skrll Exp $
+# $NetBSD: mk.bcm53xx,v 1.7 2024/02/17 15:08:32 christos Exp $
CPPFLAGS+= -mcpu=cortex-a9 -mfpu=neon
.if !empty(MACHINE_ARCH:M*eb)
@@ -13,6 +13,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel -O linux
MKUBOOTIMAGEARGS+= -a $(LOADADDRESS) -e $(LOADADDRESS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.generic64
diff -u src/sys/arch/evbarm/conf/mk.generic64:1.6 src/sys/arch/evbarm/conf/mk.generic64:1.7
--- src/sys/arch/evbarm/conf/mk.generic64:1.6 Thu Sep 3 22:21:49 2020
+++ src/sys/arch/evbarm/conf/mk.generic64 Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.generic64,v 1.6 2020/09/04 02:21:49 jakllsch Exp $
+# $NetBSD: mk.generic64,v 1.7 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= -EB
@@ -12,6 +12,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
BOARDTYPE= evbarm64
MKUBOOTIMAGEARGS= -f arm64 -u -a 0x200000
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
SYSTEM_LD_TAIL_EXTRA+= && \
echo ${OBJCOPY} -S -O binary $@ [email protected] && \
Index: src/sys/arch/evbarm/conf/mk.generic
diff -u src/sys/arch/evbarm/conf/mk.generic:1.10 src/sys/arch/evbarm/conf/mk.generic:1.11
--- src/sys/arch/evbarm/conf/mk.generic:1.10 Sat Aug 29 15:06:18 2020
+++ src/sys/arch/evbarm/conf/mk.generic Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.generic,v 1.10 2020/08/29 19:06:18 jakllsch Exp $
+# $NetBSD: mk.generic,v 1.11 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -14,6 +14,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel_noload -O linux -C none
MKUBOOTIMAGEARGS+= -e 0
MKUBOOTIMAGEARGS+= -n "NetBSD/${BOARDTYPE:U${MACHINE_ARCH}} ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ [email protected]; \
Index: src/sys/arch/evbarm/conf/mk.gumstix
diff -u src/sys/arch/evbarm/conf/mk.gumstix:1.7 src/sys/arch/evbarm/conf/mk.gumstix:1.8
--- src/sys/arch/evbarm/conf/mk.gumstix:1.7 Sat May 18 04:49:23 2019
+++ src/sys/arch/evbarm/conf/mk.gumstix Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.gumstix,v 1.7 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: mk.gumstix,v 1.8 2024/02/17 15:08:32 christos Exp $
.if ${BOARDTYPE} == "gumstix"
SYSTEM_FIRST_OBJ= gumstix_start.o
@@ -21,6 +21,9 @@ KERNEL_BASE_VIRT=$(LOADADDRESS)
MKUBOOTIMAGEARGS= -A arm -T kernel ${MKUBOOTEXTRAARGS}
MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.integrator_cp
diff -u src/sys/arch/evbarm/conf/mk.integrator_cp:1.1 src/sys/arch/evbarm/conf/mk.integrator_cp:1.2
--- src/sys/arch/evbarm/conf/mk.integrator_cp:1.1 Tue Feb 19 05:57:09 2013
+++ src/sys/arch/evbarm/conf/mk.integrator_cp Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.integrator_cp,v 1.1 2013/02/19 10:57:09 skrll Exp $
+# $NetBSD: mk.integrator_cp,v 1.2 2024/02/17 15:08:32 christos Exp $
SYSTEM_FIRST_OBJ= intmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/integrator/intmmu.S
@@ -10,6 +10,9 @@ LOADADDRESS= 0x00100000
MKUBOOTIMAGEARGS= -A arm -T kernel
MKUBOOTIMAGEARGS+= -a $(LOADADDRESS) -e $(LOADADDRESS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.kobo
diff -u src/sys/arch/evbarm/conf/mk.kobo:1.2 src/sys/arch/evbarm/conf/mk.kobo:1.3
--- src/sys/arch/evbarm/conf/mk.kobo:1.2 Sat May 18 04:49:23 2019
+++ src/sys/arch/evbarm/conf/mk.kobo Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.kobo,v 1.2 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: mk.kobo,v 1.3 2024/02/17 15:08:32 christos Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
@@ -8,6 +8,9 @@ SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_sta
MKUBOOTIMAGEARGS= -A arm -T kernel -O linux
MKUBOOTIMAGEARGS+= -a $(LOADADDRESS) -e $(LOADADDRESS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.mv2120
diff -u src/sys/arch/evbarm/conf/mk.mv2120:1.2 src/sys/arch/evbarm/conf/mk.mv2120:1.3
--- src/sys/arch/evbarm/conf/mk.mv2120:1.2 Wed Nov 30 15:00:39 2011
+++ src/sys/arch/evbarm/conf/mk.mv2120 Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.mv2120,v 1.2 2011/11/30 20:00:39 jakllsch Exp $
+# $NetBSD: mk.mv2120,v 1.3 2024/02/17 15:08:32 christos Exp $
SYSTEM_FIRST_OBJ= marvell_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/marvell/marvell_start.S
@@ -23,6 +23,9 @@ KERNEL_BASE_VIRT=0xc0400040
MKUBOOTIMAGEARGS= -A arm -T kernel
MKUBOOTIMAGEARGS+= -a ${UIMAGE_BASE_PHYS} -E ${KERNEL_BASE_PHYS}
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
SYSTEM_LD_TAIL_EXTRA+=; \
Index: src/sys/arch/evbarm/conf/mk.marvell
diff -u src/sys/arch/evbarm/conf/mk.marvell:1.5 src/sys/arch/evbarm/conf/mk.marvell:1.6
--- src/sys/arch/evbarm/conf/mk.marvell:1.5 Tue Mar 18 02:23:45 2014
+++ src/sys/arch/evbarm/conf/mk.marvell Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.marvell,v 1.5 2014/03/18 06:23:45 matt Exp $
+# $NetBSD: mk.marvell,v 1.6 2024/02/17 15:08:32 christos Exp $
SYSTEM_FIRST_OBJ?= marvell_start.o
SYSTEM_FIRST_SFILE?= ${THISARM}/marvell/marvell_start.S
@@ -11,6 +11,9 @@ KERNEL_BASE_VIRT?=0xc0008000
MKUBOOTIMAGEARGS= -A arm -T kernel
MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.ti
diff -u src/sys/arch/evbarm/conf/mk.ti:1.4 src/sys/arch/evbarm/conf/mk.ti:1.5
--- src/sys/arch/evbarm/conf/mk.ti:1.4 Wed Nov 21 03:55:05 2018
+++ src/sys/arch/evbarm/conf/mk.ti Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $
+# $NetBSD: mk.ti,v 1.5 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -15,6 +15,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel -O linux
MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
