[src/trunk]: src/sys/arch/alpha Change base address to account for later Alph...

[jklos <jklos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c4c2dbd8b15e
branches:  trunk
changeset: 813178:c4c2dbd8b15e
user:      jklos <jklos%NetBSD.org@localhost>
date:      Wed Jan 20 12:49:21 2016 +0000

description:
Change base address to account for later Alpha models with later firmware
which require more space for SRM.

diffstat:

 sys/arch/alpha/conf/GENERIC             |  5 +++--
 sys/arch/alpha/conf/Makefile.alpha      |  4 ++--
 sys/arch/alpha/include/param.h          |  4 ++--
 sys/arch/alpha/stand/Makefile.bootprogs |  6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r 6eeec0fe56da -r c4c2dbd8b15e sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Wed Jan 20 05:58:49 2016 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Wed Jan 20 12:49:21 2016 +0000
@@ -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 @@
 
 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 @@
 #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
diff -r 6eeec0fe56da -r c4c2dbd8b15e sys/arch/alpha/conf/Makefile.alpha
--- a/sys/arch/alpha/conf/Makefile.alpha        Wed Jan 20 05:58:49 2016 +0000
+++ b/sys/arch/alpha/conf/Makefile.alpha        Wed Jan 20 12:49:21 2016 +0000
@@ -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 @@
 ## (5) link settings
 ##
 LINKFORMAT=    -N
-TEXTADDR?=     fffffc0000430000
+TEXTADDR?=     fffffc0000a00000
 ENTRYPOINT=    __transfer
 EXTRA_LINKFLAGS=       -G 4
 STRIPFLAGS=    -g -X
diff -r 6eeec0fe56da -r c4c2dbd8b15e sys/arch/alpha/include/param.h
--- a/sys/arch/alpha/include/param.h    Wed Jan 20 05:58:49 2016 +0000
+++ b/sys/arch/alpha/include/param.h    Wed Jan 20 12:49:21 2016 +0000
@@ -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
diff -r 6eeec0fe56da -r c4c2dbd8b15e sys/arch/alpha/stand/Makefile.bootprogs
--- a/sys/arch/alpha/stand/Makefile.bootprogs   Wed Jan 20 05:58:49 2016 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootprogs   Wed Jan 20 12:49:21 2016 +0000
@@ -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 @@
 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