Module Name: src
Committed By: jklos
Date: Wed Jan 20 12:49:21 UTC 2016
Modified Files:
src/sys/arch/alpha/conf: GENERIC Makefile.alpha
src/sys/arch/alpha/include: param.h
src/sys/arch/alpha/stand: Makefile.bootprogs
Log Message:
Change base address to account for later Alpha models with later firmware
which require more space for SRM.
To generate a diff of this commit:
cvs rdiff -u -r1.366 -r1.367 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/alpha/conf/Makefile.alpha
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/include/param.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/alpha/stand/Makefile.bootprogs
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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.366 src/sys/arch/alpha/conf/GENERIC:1.367
--- src/sys/arch/alpha/conf/GENERIC:1.366 Sat Sep 26 16:33:16 2015
+++ src/sys/arch/alpha/conf/GENERIC Wed Jan 20 12:49:21 2016
@@ -1,4 +1,4 @@
-# $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.
@@ -19,7 +19,7 @@ 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
@@ -401,6 +401,7 @@ ld* at iop? tid ? # block devices
#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
Index: src/sys/arch/alpha/conf/Makefile.alpha
diff -u src/sys/arch/alpha/conf/Makefile.alpha:1.83 src/sys/arch/alpha/conf/Makefile.alpha:1.84
--- src/sys/arch/alpha/conf/Makefile.alpha:1.83 Sun Mar 10 07:18:20 2013
+++ src/sys/arch/alpha/conf/Makefile.alpha Wed Jan 20 12:49:21 2016
@@ -1,4 +1,4 @@
-# $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
#
@@ -67,7 +67,7 @@ lock_stubs.o: assym.h
## (5) link settings
##
LINKFORMAT= -N
-TEXTADDR?= fffffc0000430000
+TEXTADDR?= fffffc0000a00000
ENTRYPOINT= __transfer
EXTRA_LINKFLAGS= -G 4
STRIPFLAGS= -g -X
Index: src/sys/arch/alpha/include/param.h
diff -u src/sys/arch/alpha/include/param.h:1.43 src/sys/arch/alpha/include/param.h:1.44
--- src/sys/arch/alpha/include/param.h:1.43 Mon Jan 14 10:46:14 2013
+++ src/sys/arch/alpha/include/param.h Wed Jan 20 12:49:21 2016
@@ -1,4 +1,4 @@
-/* $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.
@@ -57,7 +57,7 @@
#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
Index: src/sys/arch/alpha/stand/Makefile.bootprogs
diff -u src/sys/arch/alpha/stand/Makefile.bootprogs:1.34 src/sys/arch/alpha/stand/Makefile.bootprogs:1.35
--- src/sys/arch/alpha/stand/Makefile.bootprogs:1.34 Thu Jan 16 01:15:33 2014
+++ src/sys/arch/alpha/stand/Makefile.bootprogs Wed Jan 20 12:49:21 2016
@@ -1,4 +1,4 @@
-# $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
@@ -89,9 +89,9 @@ PRIMARY_HEAP_LIMIT= (${REGION1_START} +
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
