Module Name: src
Committed By: uwe
Date: Mon Dec 18 23:05:25 UTC 2023
Modified Files:
src/sys/arch/netwinder/conf: Makefile.netwinder.inc std.netwinder
Log Message:
netwinder: specify kernel make variables in the makefile
There's not much sense to specify makeoptions in std.netwinder for
config(1) to move them to the generated makefile, when there's already
Makefile.netwinder.inc where these variables can be specified directly.
Move ENTRYPOINT. Do NOT move LOADADDRESS - we don't want to use it as
it is kinda wrong and it will override the ld script. Instead
explicitly set LINKTEXT to be empty to avoid the common kernel
makefile to supply the unwanted -Ttext option.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/netwinder/conf/Makefile.netwinder.inc
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/netwinder/conf/std.netwinder
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/netwinder/conf/Makefile.netwinder.inc
diff -u src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.11 src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.12
--- src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.11 Mon Aug 24 14:04:24 2015
+++ src/sys/arch/netwinder/conf/Makefile.netwinder.inc Mon Dec 18 23:05:25 2023
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile.netwinder.inc,v 1.11 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.netwinder.inc,v 1.12 2023/12/18 23:05:25 uwe Exp $
CPPFLAGS+= -D${MACHINE}
SYSTEM_FIRST_OBJ= nwmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S
+ENTRYPOINT= nwstart
+# don't let Makefile.kern.inc override placement of the text segment
+# specified in the ld script
KERNLDSCRIPT= ${THISARM}/conf/kern.ldscript
+LINKTEXT= # suppress -Ttext
Index: src/sys/arch/netwinder/conf/std.netwinder
diff -u src/sys/arch/netwinder/conf/std.netwinder:1.16 src/sys/arch/netwinder/conf/std.netwinder:1.17
--- src/sys/arch/netwinder/conf/std.netwinder:1.16 Fri Sep 21 14:22:37 2012
+++ src/sys/arch/netwinder/conf/std.netwinder Mon Dec 18 23:05:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwinder,v 1.16 2012/09/21 14:22:37 matt Exp $
+# $NetBSD: std.netwinder,v 1.17 2023/12/18 23:05:25 uwe Exp $
#
# standard NetBSD/netwinder options
@@ -16,8 +16,5 @@ options _ARM32_NEED_BUS_DMA_BOUNCE
options ARM_INTR_IMPL="<arm/footbridge/footbridge_intr.h>"
-makeoptions LOADADDRESS="0xF000C000"
-makeoptions ENTRYPOINT="nwstart"
-
# Firmware leaves pckbc uninited
options PCKBC_CNATTACH_SELFTEST
