Module Name: src
Committed By: hkenken
Date: Thu Jun 13 04:20:23 UTC 2019
Modified Files:
src/sys/arch/evbarm/conf: mk.netwalker std.netwalker
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
Removed Files:
src/sys/arch/evbarm/netwalker: netwalker_start.S
Log Message:
Use armv6_start.S
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.netwalker
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/netwalker/netwalker_machdep.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/netwalker/netwalker_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/evbarm/conf/mk.netwalker
diff -u src/sys/arch/evbarm/conf/mk.netwalker:1.4 src/sys/arch/evbarm/conf/mk.netwalker:1.5
--- src/sys/arch/evbarm/conf/mk.netwalker:1.4 Wed Apr 9 04:00:50 2014
+++ src/sys/arch/evbarm/conf/mk.netwalker Thu Jun 13 04:20:23 2019
@@ -1,12 +1,11 @@
-# $NetBSD: mk.netwalker,v 1.4 2014/04/09 04:00:50 hkenken Exp $
+# $NetBSD: mk.netwalker,v 1.5 2019/06/13 04:20:23 hkenken Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
-SYSTEM_FIRST_OBJ= netwalker_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/netwalker/netwalker_start.S
+ENTRYPOINT= generic_start
-KERNEL_BASE_PHYS=0x90100000
-KERNEL_BASE_VIRT=0x80100000
+SYSTEM_FIRST_OBJ= armv6_start.o
+SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_start.S
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.12 src/sys/arch/evbarm/conf/std.netwalker:1.13
--- src/sys/arch/evbarm/conf/std.netwalker:1.12 Mon Oct 15 16:54:54 2018
+++ src/sys/arch/evbarm/conf/std.netwalker Thu Jun 13 04:20:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwalker,v 1.12 2018/10/15 16:54:54 skrll Exp $
+# $NetBSD: std.netwalker,v 1.13 2019/06/13 04:20:23 hkenken Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
@@ -8,21 +8,25 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx51 config definitions.
include "arch/evbarm/conf/files.netwalker"
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/imx/imx51_intr.h>"
+options DRAM_BLOCKS=256
+options EVBARM_BOARDTYPE="netwalker"
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options __HAVE_FAST_SOFTINTS # should be in types.h
-options __HAVE_CPU_COUNTER
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options ARM_HAS_VBAR
options TPIDRPRW_IS_CURCPU
+options __BUS_SPACE_HAS_STREAM_METHODS
+options __HAVE_CPU_COUNTER
+options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_GENERIC_START
+options __HAVE_GENERIC_CPU_INITCLOCKS
+options __HAVE_FAST_SOFTINTS # should be in types.h
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=800000000
-options EVBARM_BOARDTYPE="netwalker"
-options FPU_VFP
-makeoptions LOADADDRESS="0x90100000"
-makeoptions BOARDTYPE="netwalker"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.netwalker"
-options ARM_INTR_IMPL="<arch/arm/imx/imx51_intr.h>"
-options ARM_GENERIC_TODR
+makeoptions KERNEL_BASE_PHYS=0x90008000
+makeoptions KERNEL_BASE_VIRT=0x80008000
Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.23 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.24
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.23 Mon Jan 21 07:47:30 2019
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Thu Jun 13 04:20:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.23 2019/01/21 07:47:30 skrll Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.24 2019/06/13 04:20:23 hkenken Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.23 2019/01/21 07:47:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.24 2019/06/13 04:20:23 hkenken Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -164,6 +164,8 @@ char *boot_args = NULL;
extern char KERNEL_BASE_phys[];
+u_int uboot_args[4] __attribute__((__section__(".data")));
+
extern int cpu_do_powersave;
/*
