Module Name: src
Committed By: tsutsui
Date: Thu Nov 13 16:18:38 UTC 2014
Modified Files:
src/distrib/luna68k/instkernel: Makefile
src/etc/etc.luna68k: Makefile.inc
src/sys/arch/luna68k/conf: Makefile.luna68k
Removed Files:
src/sys/arch/luna68k/conf: kern.ldscript.head kern.ldscript.tail
Log Message:
Stop building a.out kernels so that mkldscript.sh is no longer necessary.
Tested "build.sh release", and the default ELF GENERIC kernel loaded by
the native bootloader just works on LUNA-II.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/luna68k/instkernel/Makefile
cvs rdiff -u -r1.6 -r1.7 src/etc/etc.luna68k/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.1 -r0 src/sys/arch/luna68k/conf/kern.ldscript.head \
src/sys/arch/luna68k/conf/kern.ldscript.tail
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/luna68k/instkernel/Makefile
diff -u src/distrib/luna68k/instkernel/Makefile:1.1 src/distrib/luna68k/instkernel/Makefile:1.2
--- src/distrib/luna68k/instkernel/Makefile:1.1 Sat Jul 16 15:52:21 2011
+++ src/distrib/luna68k/instkernel/Makefile Thu Nov 13 16:18:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/07/16 15:52:21 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2014/11/13 16:18:38 tsutsui Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,9 +9,6 @@ RAMDISK= ${RAMDISKDIR}/ramdisk.fs
MDSETTARGETS= INSTALL ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
-MDSET_SUFFIXES.-= aout create-aout
-create-aout= ${ELF2AOUT} ${.TARGET:R} ${.TARGET}
-
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>
Index: src/etc/etc.luna68k/Makefile.inc
diff -u src/etc/etc.luna68k/Makefile.inc:1.6 src/etc/etc.luna68k/Makefile.inc:1.7
--- src/etc/etc.luna68k/Makefile.inc:1.6 Mon Oct 17 14:42:42 2011
+++ src/etc/etc.luna68k/Makefile.inc Thu Nov 13 16:18:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2011/10/17 14:42:42 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.7 2014/11/13 16:18:38 tsutsui Exp $
#
# etc.luna68k/Makefile.inc -- luna68k-specific etc Makefile targets
#
@@ -7,7 +7,6 @@
# to update the release documentation in distrib/notes/common/contents
KERNEL_SETS= GENERIC
-KERNEL_SUFFIXES= aout
BUILD_KERNELS= INSTALL
Index: src/sys/arch/luna68k/conf/Makefile.luna68k
diff -u src/sys/arch/luna68k/conf/Makefile.luna68k:1.25 src/sys/arch/luna68k/conf/Makefile.luna68k:1.26
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.25 Thu Nov 13 15:03:06 2014
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Thu Nov 13 16:18:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.25 2014/11/13 15:03:06 uebayasi Exp $
+# $NetBSD: Makefile.luna68k,v 1.26 2014/11/13 16:18:38 tsutsui Exp $
# Makefile for NetBSD
#
@@ -60,23 +60,8 @@ locore.o: ${LUNA68K}/luna68k/locore.s as
##
## (5) link settings
##
-LINKFORMAT= -N -T ldscript
-.if (${OBJECT_FMT} == "ELF")
-# Need to convert the kernel from ELF to a.out so that PROM can load it.
-
-SYSTEM_LD_HEAD_EXTRA+=; \
- ( cat ${LUNA68K}/conf/kern.ldscript.head ; \
- OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
- ${SYSTEM_OBJ} ; \
- cat ${LUNA68K}/conf/kern.ldscript.tail ) > ldscript
-SYSTEM_DEP+= ${LUNA68K}/conf/kern.ldscript.head \
- $S/conf/mkldscript.sh \
- ${LUNA68K}/conf/kern.ldscript.tail
-
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo "${ELF2AOUT} $@ $@.aout" ; \
- ${ELF2AOUT} $@ $@.aout
-.endif
+LINKFORMAT= -N
+TEXTADDR?= 0xc000
##
## (6) port specific target dependencies
