Tue May 7 19:24:33 2024 UTC (25d)
Rename ${PROGAOUT} -> ${PROGELF} to reflect reality.


(tsutsui)
diff -r1.38 -r1.39 src/sys/arch/hp300/stand/Makefile.buildboot
diff -r1.11 -r1.12 src/sys/arch/hp300/stand/inst/Makefile
diff -r1.11 -r1.12 src/sys/arch/hp300/stand/uboot/Makefile
cvs diff -r1.38 -r1.39 src/sys/arch/hp300/stand/Makefile.buildboot (expand / switch to unified diff)

--- src/sys/arch/hp300/stand/Makefile.buildboot 2024/02/08 18:10:34 1.38
+++ src/sys/arch/hp300/stand/Makefile.buildboot 2024/05/07 19:24:32 1.39
@@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
1# $NetBSD: Makefile.buildboot,v 1.38 2024/02/08 18:10:34 christos Exp $ 1# $NetBSD: Makefile.buildboot,v 1.39 2024/05/07 19:24:32 tsutsui Exp $
2 2
3# RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long 3# RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long
4RELOC= FFF00000 4RELOC= FFF00000
5 5
6S= ${.CURDIR}/../../../.. 6S= ${.CURDIR}/../../../..
7 7
8.PATH: ${.CURDIR}/../common 8.PATH: ${.CURDIR}/../common
9 9
10PROG= ${PROGAOUT}.lif 10PROG= ${PROGELF}.lif
11WARNS?= 1 11WARNS?= 1
12 12
13SRCS= ${COMMONSOURCE} ${DRIVERSOURCE} ${PROGSOURCE} 13SRCS= ${COMMONSOURCE} ${DRIVERSOURCE} ${PROGSOURCE}
14NOMAN= # defined 14NOMAN= # defined
15STRIPFLAG= 15STRIPFLAG=
16BINMODE= 444 16BINMODE= 444
17 17
18CLEANFILES+= ${PROGAOUT} 18CLEANFILES+= ${PROGELF}
19 19
20CPPFLAGS+= -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. -I${.OBJDIR} 20CPPFLAGS+= -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. -I${.OBJDIR}
21CPPFLAGS+= -Wno-main 21CPPFLAGS+= -Wno-main
22CPPFLAGS+= -D__daddr_t=int32_t 22CPPFLAGS+= -D__daddr_t=int32_t
23CFLAGS= -Os -fno-unwind-tables -msoft-float -ffreestanding 23CFLAGS= -Os -fno-unwind-tables -msoft-float -ffreestanding
24 24
25# XXX SHOULD NOT NEED TO DEFINE THESE! 25# XXX SHOULD NOT NEED TO DEFINE THESE!
26LIBCRT0= 26LIBCRT0=
27LIBCRTI= 27LIBCRTI=
28LIBC= 28LIBC=
29LIBCRTBEGIN= 29LIBCRTBEGIN=
30LIBCRTEND= 30LIBCRTEND=
31 31
32.if ${MKREPRO_TIMESTAMP:Uno} != "no" 32.if ${MKREPRO_TIMESTAMP:Uno} != "no"
33HP300MKBOOT_TIMESTAMP=-t "${MKREPRO_TIMESTAMP}" 33HP300MKBOOT_TIMESTAMP=-t "${MKREPRO_TIMESTAMP}"
34.endif 34.endif
35 35
36${PROG}: ${PROGAOUT} 36${PROG}: ${PROGELF}
37 ${OBJCOPY} --output-target=binary ${PROGAOUT} ${PROGAOUT}.bin 37 ${OBJCOPY} --output-target=binary ${PROGELF} ${PROGELF}.bin
38 ${TOOL_HP300MKBOOT} -l 0x${RELOC} ${HP300MKBOOT_TIMESTAMP} ${PROGAOUT}.bin ${PROG} 38 ${TOOL_HP300MKBOOT} -l 0x${RELOC} ${HP300MKBOOT_TIMESTAMP} ${PROGELF}.bin ${PROG}
39 rm -f ${PROGAOUT}.bin 39 rm -f ${PROGELF}.bin
40 40
41.include "${S}/conf/newvers_stand.mk" 41.include "${S}/conf/newvers_stand.mk"
42 42
43CPPFLAGS+= -DDCACONSOLE -DAPCICONSOLE -DITECONSOLE -DDCMCONSOLE 43CPPFLAGS+= -DDCACONSOLE -DAPCICONSOLE -DITECONSOLE -DDCMCONSOLE
44CPPFLAGS+= -DHIL_KEYBOARD -DUK_KEYBOARD 44CPPFLAGS+= -DHIL_KEYBOARD -DUK_KEYBOARD
45CPPFLAGS+= -DDOMAIN_KEYBOARD 45CPPFLAGS+= -DDOMAIN_KEYBOARD
46CPPFLAGS+= -D_STANDALONE -DCOMPAT_NOLABEL -Dhp300 46CPPFLAGS+= -D_STANDALONE -DCOMPAT_NOLABEL -Dhp300
47CPPFLAGS+= -DCOMPAT_UFS -DNO_LSEEK 47CPPFLAGS+= -DCOMPAT_UFS -DNO_LSEEK
48CPPFLAGS+= -DLIBSA_CREAD_NOCRC 48CPPFLAGS+= -DLIBSA_CREAD_NOCRC
49 49
50# if sun bootparams is desired 50# if sun bootparams is desired
51#CPPFLAGS+= -DSUN_BOOTPARAMS 51#CPPFLAGS+= -DSUN_BOOTPARAMS
52 52
@@ -72,18 +72,18 @@ LIBKERN= ${KERNLIB} @@ -72,18 +72,18 @@ LIBKERN= ${KERNLIB}
72 72
73### find out what to use for libz 73### find out what to use for libz
74Z_AS= library 74Z_AS= library
75.include "${S}/lib/libz/Makefile.inc" 75.include "${S}/lib/libz/Makefile.inc"
76LIBZ= ${ZLIB} 76LIBZ= ${ZLIB}
77 77
78### find out what to use for libsa 78### find out what to use for libsa
79SA_AS= library 79SA_AS= library
80SAMISCMAKEFLAGS+="SA_USE_CREAD=yes" 80SAMISCMAKEFLAGS+="SA_USE_CREAD=yes"
81SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes" 81SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
82.include "${S}/lib/libsa/Makefile.inc" 82.include "${S}/lib/libsa/Makefile.inc"
83LIBSA= ${SALIB} 83LIBSA= ${SALIB}
84 84
85${PROGAOUT}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} 85${PROGELF}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
86 ${LD} -N -Ttext ${RELOC} -e begin -o ${PROGAOUT} \ 86 ${LD} -N -Ttext ${RELOC} -e begin -o ${PROGELF} \
87 ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} 87 ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
88 @${SIZE} ${PROGAOUT} 88 @${SIZE} ${PROGELF}
89 @echo ${PROGAOUT} total size should not exceed 1044480 bytes 89 @echo ${PROGELF} total size should not exceed 1044480 bytes
cvs diff -r1.11 -r1.12 src/sys/arch/hp300/stand/inst/Makefile (expand / switch to unified diff)

--- src/sys/arch/hp300/stand/inst/Makefile 2024/04/29 07:13:42 1.11
+++ src/sys/arch/hp300/stand/inst/Makefile 2024/05/07 19:24:33 1.12
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.12 2024/05/07 19:24:33 tsutsui Exp $
2 2
3PROGAOUT= inst 3PROGELF= inst
4PROGSOURCE= inst.c 4PROGSOURCE= inst.c
5NEWVERSWHAT= "Miniroot Installer" 5NEWVERSWHAT= "Miniroot Installer"
6 6
7CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK 7CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
8 8
9LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST 9LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST
10 10
11.include "../Makefile.buildboot" 11.include "../Makefile.buildboot"
12 12
13beforeinstall: 13beforeinstall:
14 ${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \ 14 ${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
15 ${DESTDIR}${BINDIR}/rbootd 15 ${DESTDIR}${BINDIR}/rbootd
16 16
cvs diff -r1.11 -r1.12 src/sys/arch/hp300/stand/uboot/Makefile (expand / switch to unified diff)

--- src/sys/arch/hp300/stand/uboot/Makefile 2024/04/29 07:13:42 1.11
+++ src/sys/arch/hp300/stand/uboot/Makefile 2024/05/07 19:24:33 1.12
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.12 2024/05/07 19:24:33 tsutsui Exp $
2 2
3PROGAOUT= uboot 3PROGELF= uboot
4PROGSOURCE= uboot.c tgets.c 4PROGSOURCE= uboot.c tgets.c
5NEWVERSWHAT= "Primary Boot" 5NEWVERSWHAT= "Primary Boot"
6 6
7CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK 7CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
8CPPFLAGS+= -DSUPPORT_UFS2 8CPPFLAGS+= -DSUPPORT_UFS2
9 9
10LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot 10LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot
11LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd 11LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd
12LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot 12LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot
13LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd 13LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd
14LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot 14LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot
15LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct 15LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct
16LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT 16LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT