CVS commit: src/sys/arch/netwinder/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 06:37:09 UTC 2015
Modified Files:
src/sys/arch/netwinder/conf: kern.ldscript
Log Message:
Redo previous; explicitly adjust .data load addr to get the identical ELF.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/netwinder/conf/kern.ldscript
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/kern.ldscript
diff -u src/sys/arch/netwinder/conf/kern.ldscript:1.7 src/sys/arch/netwinder/conf/kern.ldscript:1.8
--- src/sys/arch/netwinder/conf/kern.ldscript:1.7 Fri Aug 21 04:13:23 2015
+++ src/sys/arch/netwinder/conf/kern.ldscript Fri Aug 21 06:37:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.7 2015/08/21 04:13:23 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.8 2015/08/21 06:37:09 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-littlearm, elf32-bigarm,
elf32-littlearm)
@@ -88,4 +88,10 @@ SECTIONS
{
*(.text)
} =0
+
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+*(.data)
+ }
}
CVS commit: src/sys/arch/netwinder/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:22:18 UTC 2015
Modified Files:
src/sys/arch/netwinder/conf: Makefile.netwinder.inc
Log Message:
Use ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/netwinder/conf/Makefile.netwinder.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/netwinder/conf/Makefile.netwinder.inc
diff -u src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.9 src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.10
--- src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.9 Sat Nov 15 14:03:37 2014
+++ src/sys/arch/netwinder/conf/Makefile.netwinder.inc Thu Aug 20 06:22:18 2015
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.netwinder.inc,v 1.9 2014/11/15 14:03:37 uebayasi Exp $
+# $NetBSD: Makefile.netwinder.inc,v 1.10 2015/08/20 06:22:18 uebayasi Exp $
CPPFLAGS+= -D${MACHINE}
SYSTEM_FIRST_OBJ= nwmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S
-LINKSCRIPT= -T ${THISARM}/conf/kern.ldscript
+KERNLDSCRIPT= ${THISARM}/conf/kern.ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
CVS commit: src/sys/arch/netwinder/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 04:13:23 UTC 2015
Modified Files:
src/sys/arch/netwinder/conf: kern.ldscript
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/netwinder/conf/kern.ldscript
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/kern.ldscript
diff -u src/sys/arch/netwinder/conf/kern.ldscript:1.6 src/sys/arch/netwinder/conf/kern.ldscript:1.7
--- src/sys/arch/netwinder/conf/kern.ldscript:1.6 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/netwinder/conf/kern.ldscript Fri Aug 21 04:13:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.6 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.7 2015/08/21 04:13:23 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-littlearm, elf32-bigarm,
elf32-littlearm)
@@ -6,25 +6,21 @@ OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = 0xc000;
- KERNEL_BASE_virt = 0xf000c000;
-
/* 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.*) }
@@ -36,14 +32,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.*)
@@ -79,3 +73,19 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
+SECTIONS
+{
+ KERNEL_BASE_phys = 0xc000;
+ KERNEL_BASE_virt = 0xf000c000;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/netwinder/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 14:03:37 UTC 2014
Modified Files:
src/sys/arch/netwinder/conf: Makefile.netwinder.inc
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/netwinder/conf/Makefile.netwinder.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/netwinder/conf/Makefile.netwinder.inc
diff -u src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.8 src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.9
--- src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.8 Thu Nov 24 12:54:29 2005
+++ src/sys/arch/netwinder/conf/Makefile.netwinder.inc Sat Nov 15 14:03:37 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.netwinder.inc,v 1.8 2005/11/24 12:54:29 dbj Exp $
+# $NetBSD: Makefile.netwinder.inc,v 1.9 2014/11/15 14:03:37 uebayasi Exp $
CPPFLAGS+= -D${MACHINE}
SYSTEM_FIRST_OBJ= nwmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S
-LINKFLAGS= -T ${THISARM}/conf/kern.ldscript
+LINKSCRIPT= -T ${THISARM}/conf/kern.ldscript
CVS commit: src/sys/arch/netwinder/netwinder
Module Name:src
Committed By: matt
Date: Sat Sep 13 17:42:07 UTC 2014
Modified Files:
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
Log Message:
vm_offset_t - vaddr_t, vm_size_t - vsize_t
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
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/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.81 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.82
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.81 Sun Aug 18 21:42:16 2013
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Sat Sep 13 17:42:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.81 2013/08/18 21:42:16 matt Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.82 2014/09/13 17:42:07 matt Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.81 2013/08/18 21:42:16 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.82 2014/09/13 17:42:07 matt Exp $);
#include opt_ddb.h
#include opt_pmap_debug.h
@@ -316,9 +316,9 @@ netwinder_reset(void)
* time with section mappings.
*/
struct l1_sec_map {
- vm_offset_t va;
- vm_offset_t pa;
- vm_size_t size;
+ vaddr_t va;
+ vaddr_t pa;
+ vsize_t size;
vm_prot_t prot;
int cache;
} l1_sec_table[] = {
@@ -646,7 +646,7 @@ initarm(void *arg)
*/
loop = 0;
while (l1_sec_table[loop].size) {
- vm_size_t sz;
+ vsize_t sz;
#ifdef VERBOSE_INIT_ARM
printf(%08lx - %08lx @ %08lx\n, l1_sec_table[loop].pa,
CVS commit: src/sys/arch/netwinder/netwinder
Module Name:src Committed By: matt Date: Fri Aug 3 15:56:07 UTC 2012 Modified Files: src/sys/arch/netwinder/netwinder: netwinder_machdep.c Log Message: Remove uneeded declarations. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 \ src/sys/arch/netwinder/netwinder/netwinder_machdep.c 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/netwinder/netwinder_machdep.c diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.76 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.77 --- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.76 Fri Jul 1 20:50:34 2011 +++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Fri Aug 3 15:56:06 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $ */ +/* $NetBSD: netwinder_machdep.c,v 1.77 2012/08/03 15:56:06 matt Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.77 2012/08/03 15:56:06 matt Exp $); #include opt_ddb.h #include opt_pmap_debug.h @@ -143,18 +143,8 @@ vm_offset_t pagetables_start; int max_processes = 64; /* Default number */ #endif /* !PMAP_STATIC_L1S */ -/* Physical and virtual addresses for some global pages */ -pv_addr_t irqstack; -pv_addr_t undstack; -pv_addr_t abtstack; -extern pv_addr_t kernelstack; /* in arm32_machdep.c */ - vm_offset_t msgbufphys; -extern u_int data_abort_handler_address; -extern u_int prefetch_abort_handler_address; -extern u_int undefined_handler_address; - #ifdef PMAP_DEBUG extern int pmap_debug_level; #endif
CVS commit: src/sys/arch/netwinder/conf
Module Name:src Committed By: christos Date: Tue Oct 4 17:38:00 UTC 2011 Modified Files: src/sys/arch/netwinder/conf: GENERIC Log Message: bump more To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/arch/netwinder/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/netwinder/conf/GENERIC diff -u src/sys/arch/netwinder/conf/GENERIC:1.107 src/sys/arch/netwinder/conf/GENERIC:1.108 --- src/sys/arch/netwinder/conf/GENERIC:1.107 Sun Oct 2 14:33:20 2011 +++ src/sys/arch/netwinder/conf/GENERIC Tue Oct 4 13:38:00 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.107 2011/10/02 18:33:20 christos Exp $ +# $NetBSD: GENERIC,v 1.108 2011/10/04 17:38:00 christos Exp $ # # GENERIC machine description file # @@ -172,7 +172,7 @@ options SYSCTL_INCLUDE_DESCR # Include options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=61 +options SYMTAB_SPACE=65 config netbsd root on ? type ?
CVS commit: src/sys/arch/netwinder/conf
Module Name:src Committed By: christos Date: Sun Oct 2 18:33:20 UTC 2011 Modified Files: src/sys/arch/netwinder/conf: GENERIC Log Message: Bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/arch/netwinder/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/netwinder/conf/GENERIC diff -u src/sys/arch/netwinder/conf/GENERIC:1.106 src/sys/arch/netwinder/conf/GENERIC:1.107 --- src/sys/arch/netwinder/conf/GENERIC:1.106 Thu Aug 11 04:39:35 2011 +++ src/sys/arch/netwinder/conf/GENERIC Sun Oct 2 14:33:20 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.106 2011/08/11 08:39:35 he Exp $ +# $NetBSD: GENERIC,v 1.107 2011/10/02 18:33:20 christos Exp $ # # GENERIC machine description file # @@ -172,7 +172,7 @@ options SYSCTL_INCLUDE_DESCR # Include options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=60 +options SYMTAB_SPACE=61 config netbsd root on ? type ?
CVS commit: src/sys/arch/netwinder/conf
Module Name:src Committed By: he Date: Thu Aug 11 08:39:35 UTC 2011 Modified Files: src/sys/arch/netwinder/conf: GENERIC Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/arch/netwinder/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/netwinder/conf/GENERIC diff -u src/sys/arch/netwinder/conf/GENERIC:1.105 src/sys/arch/netwinder/conf/GENERIC:1.106 --- src/sys/arch/netwinder/conf/GENERIC:1.105 Thu Jun 30 20:09:33 2011 +++ src/sys/arch/netwinder/conf/GENERIC Thu Aug 11 08:39:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.105 2011/06/30 20:09:33 wiz Exp $ +# $NetBSD: GENERIC,v 1.106 2011/08/11 08:39:35 he Exp $ # # GENERIC machine description file # @@ -172,7 +172,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=59 +options SYMTAB_SPACE=60 config netbsd root on ? type ?
CVS commit: src/sys/arch/netwinder
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:50:34 UTC 2011 Modified Files: src/sys/arch/netwinder/netwinder: netwinder_machdep.c src/sys/arch/netwinder/pci: pcib.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 \ src/sys/arch/netwinder/netwinder/netwinder_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/netwinder/pci/pcib.c 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/netwinder/netwinder_machdep.c diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.75 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.76 --- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.75 Thu Jun 30 20:09:34 2011 +++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Fri Jul 1 20:50:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: netwinder_machdep.c,v 1.75 2011/06/30 20:09:34 wiz Exp $ */ +/* $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.75 2011/06/30 20:09:34 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $); #include opt_ddb.h #include opt_pmap_debug.h @@ -68,7 +68,7 @@ #include machine/bootconfig.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include machine/intr.h Index: src/sys/arch/netwinder/pci/pcib.c diff -u src/sys/arch/netwinder/pci/pcib.c:1.14 src/sys/arch/netwinder/pci/pcib.c:1.15 --- src/sys/arch/netwinder/pci/pcib.c:1.14 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/netwinder/pci/pcib.c Fri Jul 1 20:50:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: pcib.c,v 1.15 2011/07/01 20:50:34 dyoung Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -32,13 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.15 2011/07/01 20:50:34 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h
CVS commit: src/sys/arch/netwinder
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:47:00 UTC 2011
Modified Files:
src/sys/arch/netwinder: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/netwinder/Makefile
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/Makefile
diff -u src/sys/arch/netwinder/Makefile:1.3 src/sys/arch/netwinder/Makefile:1.4
--- src/sys/arch/netwinder/Makefile:1.3 Sat Oct 25 22:27:38 2008
+++ src/sys/arch/netwinder/Makefile Mon Apr 4 19:47:00 2011
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/04 19:47:00 dyoung Exp $
# Makefile for netwinder tags file and boot blocks
-TNETWINDER= ../netwinder/tags
-SNETWINDER= ../netwinder/netwinder/*.[ch] ../netwinder/include/*.h \
- ../netwinder/isa/*.[ch] ../netwinder/pci/*.[ch]
-ANETWINDER= ../netwinder/netwinder/*.s
+.include ../arm/Makefile.inc
+
+TNETWINDER= ${SYSDIR}/arch/netwinder/tags
+SNETWINDER= ${SYSDIR}/arch/netwinder/netwinder/*.[ch] \
+ ${SYSDIR}/arch/netwinder/include/*.h \
+ ${SYSDIR}/arch/netwinder/pci/*.[ch]
+ANETWINDER= ${SYSDIR}/arch/netwinder/netwinder/*.S
# Directories in which to place tags links
-DNETWINDER= isa pci include
+DNETWINDER= pci include
.include ../../kern/Make.tags.inc
tags:
- -ctags -wdtf ${TNETWINDER} ${SNETWINDER} ${COMM}
- egrep ^ENTRY(.*)|^ALTENTRY(.*) ${ANETWINDER} | \
+ -rm -f ${TNETWINDER}
+ -echo ${SNETWINDER} ${SARM} | xargs ctags -wadtf ${TNETWINDER}
+ -${FINDCOMM} | xargs ctags -wadtf ${TNETWINDER}
+ egrep ^ENTRY(.*)|^ALTENTRY(.*) ${ANETWINDER} ${AARM} | \
${TOOL_SED} -e \
- s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
+ s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
${TNETWINDER}
sort -o ${TNETWINDER} ${TNETWINDER}
