 @@ -1,17 +1,16 @@
-#	$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
+ENTRYPOINT=		generic_start
 SYSTEM_FIRST_SFILE=	${THISARM}/netwalker/netwalker_start.S
-KERNEL_BASE_PHYS=0x90100000
+SYSTEM_FIRST_OBJ=	armv6_start.o
-KERNEL_BASE_VIRT=0x80100000
+SYSTEM_FIRST_SFILE=	${ARM}/arm/armv6_start.S
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
 	echo ${TOOL_GZIP} -9nc $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -9nc $@.bin > $@.bin.gz; \
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}

 @@ -1,28 +1,32 @@
-#	$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
 machine		evbarm arm
 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>"
+makeoptions	KERNEL_BASE_PHYS=0x90008000
-options 	ARM_GENERIC_TODR
+makeoptions	KERNEL_BASE_VIRT=0x80008000

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -92,27 +92,27 @@
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * Machine dependent functions for kernel setup for Intel IQ80310 evaluation
  * boards using RedBoot firmware.
  */
 #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"
 #include "opt_console.h"
 #include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_md.h"
 #include "opt_com.h"
 #include "imxuart.h"
 #include "opt_imxuart.h"
 #include "opt_imx.h"
 #include "opt_imx51_ipuv3.h"
 @@ -154,26 +154,28 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_ma
 #if (NUKBD > 0)
 #include <dev/usb/ukbdvar.h>
 #endif
 /* Kernel text starts 1MB in from the bottom of the kernel address space. */
 #define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00100000)
 BootConfig bootconfig;		/* Boot config storage */
 static char bootargs[MAX_BOOT_STRING] = BOOT_ARGS;
 char *boot_args = NULL;
 extern char KERNEL_BASE_phys[];
 u_int uboot_args[4] __attribute__((__section__(".data")));
 extern int cpu_do_powersave;
 /*
  * Macros to translate between physical and virtual for a subset of the
  * kernel address space.  *Not* for general use.
  */
 #define KERNEL_BASE_PHYS ((paddr_t)KERNEL_BASE_phys)
 /* Prototypes */
 void consinit(void);