 @@ -1,35 +1,35 @@
-# $NetBSD: GENERIC,v 1.366 2015/09/26 16:33:16 maxv Exp $
+# $NetBSD: GENERIC,v 1.367 2016/01/20 12:49:21 jklos Exp $
+#
 # This machine description file is used to generate the default NetBSD
 # kernel.
+#
 # The machine description file can be customised for your specific
 # machine to reduce the kernel size and improve its performance.
+#
 # For further information on compiling NetBSD kernels, see the config(8)
 # man page.
+#
 # For further information on hardware support for this architecture, see
 # the intro(4) man page.  For further information about kernel options
 # for this architecture, see the options(4) man page.  For an explanation
 # of each device driver in this file see the section 4 man page for the
 # device.
 include 	"arch/alpha/conf/std.alpha"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-ident		"GENERIC-$Revision: 1.366 $"
+ident		"GENERIC-$Revision: 1.367 $"
 maxusers 32
 # CPU Support
 options 	DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 options 	DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
 options 	DEC_2100_A500	# Sable:	AlphaServer 2100
 options 	DEC_2100A_A500	# Lynx:		AlphaServer 2100A
 options 	DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
 options 	DEC_3000_300	# Pelican etc:	3000/300*
 options 	DEC_AXPPCI_33	# NoName:	AXPpci33, Multia, etc.
 options 	DEC_EB164	# EB164:	AlphaPC 164
 options 	DEC_EB64PLUS	# EB64+:	AlphaPC 64, etc.
 @@ -391,26 +391,27 @@ opl*	at	yds?
 mpu*	at	cmpci?
 mpu*	at	eso?
 mpu*	at	sb?
 mpu*	at	yds?
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor
 iopsp*	at iop? tid ?			# SCSI/FC-AL ports
 ld*	at iop? tid ?			# block devices
 # XXX dpti.c wants a processor type that is not assigned for x86-64
 #dpti*	at iop? tid 0			# DPT/Adaptec control interface
 # MII/PHY support
 brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
 icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 PHYs
 lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
 gphyter* at mii? phy ?			# NS83861 Gig-E PHY
 makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
 nsphy*	at mii? phy ?			# NS83840 PHYs
 nsphyter* at mii? phy ?			# NS83843 PHYs
 qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
 rgephy*	at mii? phy ?			# Realtek 8169S internal PHYs
 rlphy*	at mii? phy ?			# Realtek 8139 PHYs
 sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.alpha,v 1.83 2013/03/10 07:18:20 christos Exp $
+#	$NetBSD: Makefile.alpha,v 1.84 2016/01/20 12:49:21 jklos Exp $
 # Makefile for NetBSD
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/alpha/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/alpha/conf/Makefile.alpha
 # after which config should be rerun for all machines of that type.
+#
 @@ -57,27 +57,27 @@ MD_SFILES=	${ALPHA}/alpha/locore.s ${ALP
 locore.o: ${ALPHA}/alpha/locore.s assym.h
 	${NORMAL_S}
 transfer.o: ${ALPHA}/alpha/transfer.s
 	${NORMAL_S}
 lock_stubs.o: assym.h
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-N
-TEXTADDR?=	fffffc0000430000
+TEXTADDR?=	fffffc0000a00000
 ENTRYPOINT=	__transfer
 EXTRA_LINKFLAGS=	-G 4
 STRIPFLAGS=	-g -X
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 clock.o apecs.o cia.o lca.o ioasic.o icasic.o: Makefile
 ##
 ## (7) misc settings

 @@ -1,14 +1,14 @@
-/* $NetBSD: param.h,v 1.43 2013/01/14 10:46:14 he Exp $ */
+/* $NetBSD: param.h,v 1.44 2016/01/20 12:49:21 jklos Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -47,27 +47,27 @@
 #define	MACHINE_ARCH	"alpha"
 #define	MID_MACHINE	MID_ALPHA
 #ifdef _KERNEL
 #include <machine/cpu.h>
 #else
 #define ALPHA_PGSHIFT	13
 #endif
 #define	NBPG		(1 << ALPHA_PGSHIFT)		/* bytes/page */
 #define	PGOFSET		(NBPG-1)			/* byte off. into pg */
 #define	PGSHIFT		ALPHA_PGSHIFT			/* LOG2(NBPG) */
-#define	KERNBASE	0xfffffc0000230000	/* start of kernel virtual */
+#define	KERNBASE	0xfffffc0000a00000	/* start of kernel virtual */
 #define	BTOPKERNBASE	((u_long)KERNBASE >> PGSHIFT)
 #define	DEV_BSIZE	512
 #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
 #define	BLKDEV_IOSIZE	2048
 #ifndef	MAXPHYS
 #define	MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
 #endif
 #define	SSIZE		1		/* initial stack size/NBPG */
 #define	SINCR		1		/* increment of stack/NBPG */
 #define	UPAGES		2			/* pages of u-area */

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.bootprogs,v 1.34 2014/01/16 01:15:33 christos Exp $
+# $NetBSD: Makefile.bootprogs,v 1.35 2016/01/20 12:49:21 jklos Exp $
 NOMAN=			# defined
 .include <bsd.own.mk>
 S=	${.CURDIR}/../../../..
 .PATH:	${.CURDIR}/../common
 BINMODE= 444
 STRIP?=	strip
 @@ -79,29 +79,29 @@ PRIMARY_MAX_TOTAL!=	expr 16 \* 1024
 # XXX (${PRIMARY_LOAD_ADDRESS} + ${PRIMARY_MAX_TOTAL}) bt there's no easy
 # XXX way to do that calculation and 'ld' wants a single number.
 SECONDARY_LOAD_ADDRESS=	0x20004000	# XXX
 SECONDARY_MAX_LOAD!=	expr 112 \* 1024
 SECONDARY_MAX_TOTAL!=	expr ${REGION1_SIZE} - ${PRIMARY_MAX_TOTAL}
 PRIMARY_HEAP_START=	(${SECONDARY_LOAD_ADDRESS} + ${SECONDARY_MAX_LOAD})
 PRIMARY_HEAP_LIMIT=	(${REGION1_START} + ${REGION1_SIZE})
 #SECONDARY_HEAP_START=	right after secondary bss
 SECONDARY_HEAP_LIMIT=	(${REGION1_START} + ${REGION1_SIZE})
 #	standalone programs are like kernels.  They load at
-#	0xfffffc0000300000 and can use the rest of memory.
+#	0xfffffc0000800000 and can use the rest of memory.
-STANDPROG_LOAD_ADDRESS=	0xfffffc0000300000
+STANDPROG_LOAD_ADDRESS=	0xfffffc0000800000
 FILE_FORMAT_CPPFLAGS=	-DBOOT_ECOFF -DBOOT_ELF64
 UNIFIED_CPPFLAGS=	-DUNIFIED_BOOTBLOCK \
 			-DHEAP_LIMIT="${UNIFIED_HEAP_LIMIT}" \
 			${FILE_FORMAT_CPPFLAGS}
 PRIMARY_CPPFLAGS=	-DPRIMARY_BOOTBLOCK \
 			-DSECONDARY_LOAD_ADDRESS="${SECONDARY_LOAD_ADDRESS}" \
 			-DSECONDARY_MAX_LOAD="${SECONDARY_MAX_LOAD}" \
 			-DHEAP_LIMIT="${PRIMARY_HEAP_LIMIT}" \
 			-DHEAP_START="${PRIMARY_HEAP_START}"