Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MKREPRO build (Jan-Benedict Glaw)

This commit is contained in:
christos 2024-02-17 15:07:03 +00:00
parent 027b18981e
commit 25d856e749
13 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/evbarm/instkernel/ramdisk/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
# $NetBSD: Makefile,v 1.21 2024/02/17 15:07:04 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -34,6 +34,10 @@ UBOOT_IMAGE_ARCH= arm64
UBOOT_IMAGE_ARCH= arm
.endif
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MKUBOOTIMAGEARGS= -t "${MKREPRO_TIMESTAMP}"
.endif
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc"
@ -50,7 +54,7 @@ release: ${IMAGE}
${INSTALL} -d -m 755 ${RAMDISKDIR}
${RELEASE_INSTALL} ${IMAGE} ${RAMDISKDIR}
${TOOL_MKUBOOTIMAGE} -A ${UBOOT_IMAGE_ARCH} -C none -O linux \
-T ramdisk -a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" ${IMAGE} \
${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
-T ramdisk -a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" \
${MKUBOOTIMAGEARGS} ${IMAGE} ${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
.include <bsd.prog.mk>

6
distrib/utils/embedded/conf/arm64.conf
View File

@ -1,4 +1,4 @@
# $NetBSD: arm64.conf,v 1.15 2022/10/15 18:32:30 jmcneill Exp $
# $NetBSD: arm64.conf,v 1.16 2024/02/17 15:07:03 christos Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@ -51,7 +51,7 @@ populate_common() {
cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
# Install kernel to root of the FFS partition
${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
${GZIP_CMD} -dnc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
echo "./netbsd type=file uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
}
@ -102,7 +102,7 @@ populate() {
echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
case "${k}" in
*.gz)
${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
${GZIP_CMD} -dnc "${k}" > "${mnt}/boot/${tgt}"
;;
*)
cp "${k}" "${mnt}/boot/${tgt}"

6
distrib/utils/embedded/conf/arm64mbr.conf
View File

@ -1,4 +1,4 @@
# $NetBSD: arm64mbr.conf,v 1.2 2021/07/01 17:31:21 jmcneill Exp $
# $NetBSD: arm64mbr.conf,v 1.3 2024/02/17 15:07:03 christos Exp $
# ARM64 (MBR partitioning) customization script used by mkimage
#
board=arm64mbr
@ -36,7 +36,7 @@ populate_common() {
cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
# Install kernel to root of the FFS partition
${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
${GZIP_CMD} -dnc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
echo "./netbsd type=file uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
}
@ -87,7 +87,7 @@ populate() {
echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
case "${k}" in
*.gz)
${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
${GZIP_CMD} -dnc "${k}" > "${mnt}/boot/${tgt}"
;;
*)
cp "${k}" "${mnt}/boot/${tgt}"

5
sys/arch/evbarm/conf/mk.altera
View File

@ -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/osrelease.sh
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

5
sys/arch/evbarm/conf/mk.bcm53xx
View File

@ -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/osrelease.sh
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

5
sys/arch/evbarm/conf/mk.generic
View File

@ -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/osrelease.sh
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 $@ $@.img; \

5
sys/arch/evbarm/conf/mk.generic64
View File

@ -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/osrelease.sh
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 $@ $@.bin && \

5
sys/arch/evbarm/conf/mk.gumstix
View File

@ -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

5
sys/arch/evbarm/conf/mk.integrator_cp
View File

@ -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

5
sys/arch/evbarm/conf/mk.kobo
View File

@ -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_start.S
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

5
sys/arch/evbarm/conf/mk.marvell
View File

@ -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

5
sys/arch/evbarm/conf/mk.mv2120
View File

@ -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+=; \

5
sys/arch/evbarm/conf/mk.ti
View File

@ -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/osrelease.sh
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