CVS commit: src/sys/arch/epoc32/conf
Module Name:src
Committed By: mrg
Date: Sun Aug 12 09:27:02 UTC 2018
Modified Files:
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
Log Message:
conditionally set MACHINE_ARCH to arm, like other makefiles.
fixes epoc32 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/epoc32/conf/Makefile.epoc32.inc
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/epoc32/conf/Makefile.epoc32.inc
diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.5 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.6
--- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.5 Tue Aug 25 02:38:15 2015
+++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Sun Aug 12 09:27:02 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.epoc32.inc,v 1.5 2015/08/25 02:38:15 uebayasi Exp $
+# $NetBSD: Makefile.epoc32.inc,v 1.6 2018/08/12 09:27:02 mrg Exp $
-MACHINE_ARCH= arm
+MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
SYSTEM_FIRST_OBJ= epoc32_start.o
CVS commit: src/sys/arch/epoc32/conf
Module Name:src Committed By: martin Date: Wed Dec 14 14:01:10 UTC 2016 Modified Files: src/sys/arch/epoc32/conf: GENERIC Log Message: Comment out spkr at audio, as audio is commented out too To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/epoc32/conf/GENERIC 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/epoc32/conf/GENERIC diff -u src/sys/arch/epoc32/conf/GENERIC:1.11 src/sys/arch/epoc32/conf/GENERIC:1.12 --- src/sys/arch/epoc32/conf/GENERIC:1.11 Tue Dec 13 20:42:17 2016 +++ src/sys/arch/epoc32/conf/GENERIC Wed Dec 14 14:01:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.11 2016/12/13 20:42:17 christos Exp $ +# $NetBSD: GENERIC,v 1.12 2016/12/14 14:01:10 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/epoc32/conf/std.epoc32" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.11 $" +#ident "GENERIC-$Revision: 1.12 $" maxusers 32 # estimated number of users @@ -167,8 +167,7 @@ wskbd* at epockbd? #tp* at spi* # ADS7843 Touch screen #audio* at audio? - -spkr* at audio? # PC speaker (synthesized) +#spkr* at audio? # PC speaker (synthesized) # External devices
CVS commit: src/sys/arch/epoc32/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 04:00:48 UTC 2015
Modified Files:
src/sys/arch/epoc32/conf: ldscript.epoc32
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/conf/ldscript.epoc32
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/epoc32/conf/ldscript.epoc32
diff -u src/sys/arch/epoc32/conf/ldscript.epoc32:1.4 src/sys/arch/epoc32/conf/ldscript.epoc32:1.5
--- src/sys/arch/epoc32/conf/ldscript.epoc32:1.4 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/epoc32/conf/ldscript.epoc32 Fri Aug 21 04:00:48 2015
@@ -1,28 +1,24 @@
-/* $NetBSD: ldscript.epoc32,v 1.4 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: ldscript.epoc32,v 1.5 2015/08/21 04:00:48 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
PROVIDE (__exidx_start = .);
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
@@ -34,14 +30,12 @@ SECTIONS
boundary. */
. = ALIGN(0x8000);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -81,3 +75,19 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/epoc32/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:21:02 UTC 2015
Modified Files:
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
Log Message:
Clean up ${LINKSCRIPT} and ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/epoc32/conf/Makefile.epoc32.inc
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/epoc32/conf/Makefile.epoc32.inc
diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.2 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.3
--- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.2 Sat Nov 15 14:25:22 2014
+++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Thu Aug 20 06:21:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.epoc32.inc,v 1.2 2014/11/15 14:25:22 uebayasi Exp $
+# $NetBSD: Makefile.epoc32.inc,v 1.3 2015/08/20 06:21:02 uebayasi Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -8,14 +8,16 @@ SYSTEM_FIRST_SFILE= ${THISARM}/epoc32/ep
KERNEL_BASE_VIRT= $(LOADADDRESS)
-LINKSCRIPT= -T ldscript
+KERNLDSCRIPT= ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
-EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp
-
-netbsd: ldscript # XXX
+EXTRA_CLEAN+= netbsd.map assym.d ${KERNLDSCRIPT} tmp
# generate ldscript from common template
-ldscript: ${THISARM}/conf/ldscript.epoc32 ${THISARM}/conf/Makefile.epoc32.inc Makefile
+${KERNLDSCRIPT}: \
+${THISARM}/conf/ldscript.epoc32 \
+${THISARM}/conf/Makefile.epoc32.inc \
+Makefile
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.epoc32 > tmp && mv tmp $@
CVS commit: src/sys/arch/epoc32/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 14:25:22 UTC 2014
Modified Files:
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/conf/Makefile.epoc32.inc
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/epoc32/conf/Makefile.epoc32.inc
diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.1 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.2
--- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.1 Sun Apr 28 12:11:25 2013
+++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Sat Nov 15 14:25:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.epoc32.inc,v 1.1 2013/04/28 12:11:25 kiyohara Exp $
+# $NetBSD: Makefile.epoc32.inc,v 1.2 2014/11/15 14:25:22 uebayasi Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -8,7 +8,7 @@ SYSTEM_FIRST_SFILE= ${THISARM}/epoc32/ep
KERNEL_BASE_VIRT= $(LOADADDRESS)
-LINKFLAGS= -T ldscript
+LINKSCRIPT= -T ldscript
EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp
