Date: Mon, 1 Mar 2010 03:36:59 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204502 - user/jmallett/octeon/sys/mips/conf Message-ID: <201003010336.o213axuP079686@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Mon Mar 1 03:36:59 2010 New Revision: 204502 URL: http://svn.freebsd.org/changeset/base/204502 Log: o) Change my configurations. o) Load the 64-bit kernel at the same address as the n32 one. Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1 Mon Mar 1 03:24:56 2010 (r204501) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1 Mon Mar 1 03:36:59 2010 (r204502) @@ -35,7 +35,8 @@ makeoptions LDSCRIPT_NAME=ldscript.mips. makeoptions MODULES_OVERRIDE="" makeoptions TARGET_BIG_ENDIAN=defined makeoptions TARGET_64BIT=defined -makeoptions KERNLOADADDR=0xffffffff80100000 + +makeoptions KERNLOADADDR=0xffffffff81000000 include "../cavium/std.octeon1" @@ -52,12 +53,16 @@ options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options ROOTDEVNAME=\"ufs:ad0s1a\" # Original options NO_SWAPPING +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_COMPAT options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -78,14 +83,14 @@ device ether device md device uart nodevice uart_ns8250 -device rgmii -#options VERBOSE_SYSINIT +device rgmii +options VERBOSE_SYSINIT # # Use the following for Compact Flash file-system device cf -options ROOTDEVNAME = \"ufs:cf0s2\" # Unmask if compact flash is needed as RFS +#options ROOTDEVNAME = \"ufs:cf0s2\" # Unmask if compact flash is needed as RFS # # Use the following for RFS in mem-device Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Mon Mar 1 03:24:56 2010 (r204501) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Mon Mar 1 03:36:59 2010 (r204502) @@ -25,9 +25,11 @@ ident OCTEON1 makeoptions MODULES_OVERRIDE="" makeoptions TARGET_BIG_ENDIAN=defined makeoptions TARGET_N32=defined +makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.n32 makeoptions KERNLOADADDR=0xffffffff81000000 + include "../cavium/std.octeon1" hints "OCTEON1.hints" #Default places to look for devices. @@ -35,7 +37,6 @@ hints "OCTEON1.hints" #Default places makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options ISA_MIPS64 -makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" options DDB options KDB @@ -43,12 +44,16 @@ options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options ROOTDEVNAME=\"ufs:ad0s1a\" # Original options NO_SWAPPING +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_COMPAT options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -69,14 +74,14 @@ device ether device md device uart nodevice uart_ns8250 -device rgmii -#options VERBOSE_SYSINIT +device rgmii +options VERBOSE_SYSINIT # # Use the following for Compact Flash file-system device cf -options ROOTDEVNAME=\"ufs:cf0s1\" +#options ROOTDEVNAME=\"ufs:cf0s1\" # # Use the following for RFS in mem-device
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003010336.o213axuP079686>