Module Name: src
Committed By: skrll
Date: Wed Nov 21 08:55:05 UTC 2018
Modified Files:
src/sys/arch/arm/ti: files.ti
src/sys/arch/evbarm/conf: files.ti mk.ti std.ti
Removed Files:
src/sys/arch/evbarm/ti: ti_start.S
Log Message:
Make TI compile and convert TI to generic start
Compile tested only (obviously)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/files.ti
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.ti
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.ti
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.ti
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/ti/ti_start.S
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/arm/ti/files.ti
diff -u src/sys/arch/arm/ti/files.ti:1.3 src/sys/arch/arm/ti/files.ti:1.4
--- src/sys/arch/arm/ti/files.ti:1.3 Sat Mar 17 18:34:09 2018
+++ src/sys/arch/arm/ti/files.ti Wed Nov 21 08:55:05 2018
@@ -1,9 +1,6 @@
-# $NetBSD: files.ti,v 1.3 2018/03/17 18:34:09 ryo Exp $
+# $NetBSD: files.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $
#
-include arch/arm/pic/files.pic
-include arch/arm/cortex/files.cortex
-
file arch/arm/arm32/arm32_boot.c
file arch/arm/arm32/arm32_kvminit.c
file arch/arm/arm32/arm32_reboot.c
Index: src/sys/arch/evbarm/conf/files.ti
diff -u src/sys/arch/evbarm/conf/files.ti:1.1 src/sys/arch/evbarm/conf/files.ti:1.2
--- src/sys/arch/evbarm/conf/files.ti:1.1 Thu Oct 26 01:16:32 2017
+++ src/sys/arch/evbarm/conf/files.ti Wed Nov 21 08:55:05 2018
@@ -1,6 +1,9 @@
-# $NetBSD: files.ti,v 1.1 2017/10/26 01:16:32 jakllsch Exp $
+# $NetBSD: files.ti,v 1.2 2018/11/21 08:55:05 skrll Exp $
#
+include "arch/arm/pic/files.pic"
+include "arch/arm/cortex/files.cortex"
+
include "arch/evbarm/conf/files.fdt"
include "arch/arm/ti/files.ti"
Index: src/sys/arch/evbarm/conf/mk.ti
diff -u src/sys/arch/evbarm/conf/mk.ti:1.3 src/sys/arch/evbarm/conf/mk.ti:1.4
--- src/sys/arch/evbarm/conf/mk.ti:1.3 Wed Dec 13 13:52:13 2017
+++ src/sys/arch/evbarm/conf/mk.ti Wed Nov 21 08:55:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mk.ti,v 1.3 2017/12/13 13:52:13 jmcneill Exp $
+# $NetBSD: mk.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -7,10 +7,8 @@ EXTRA_LINKFLAGS+= --be8
CPPFLAGS+= -mcpu=cortex-a8
CPPFLAGS+= -mfpu=neon
-SYSTEM_FIRST_OBJ= ti_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/ti/ti_start.S
-
-GENASSYM_EXTRAS+= ${THISARM}/beagle/genassym.cf
+SYSTEM_FIRST_OBJ= armv6_start.o
+SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_start.S
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
Index: src/sys/arch/evbarm/conf/std.ti
diff -u src/sys/arch/evbarm/conf/std.ti:1.4 src/sys/arch/evbarm/conf/std.ti:1.5
--- src/sys/arch/evbarm/conf/std.ti:1.4 Wed Nov 21 08:49:58 2018
+++ src/sys/arch/evbarm/conf/std.ti Wed Nov 21 08:55:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.ti,v 1.4 2018/11/21 08:49:58 skrll Exp $
+# $NetBSD: std.ti,v 1.5 2018/11/21 08:55:05 skrll Exp $
#
machine evbarm arm
@@ -18,6 +18,7 @@ options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS
options __HAVE_GENERIC_CPU_INITCLOCKS
+options __HAVE_GENERIC_START
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options LOADADDRESS="0x80008000"
