svn commit: r205714 - projects/altix/sys/conf

[Marcel Moolenaar]

Author: marcel
Date: Fri Mar 26 22:04:11 2010
New Revision: 205714
URL: http://svn.freebsd.org/changeset/base/205714

Log:
  Implement a quick and dirty kluge and simply load the kernel
  at a physical address that does exist, but otherwise do not
  switch to a relocatable kernel yet.
  
  This allows the kernel to boot with the current loader and
  enables working on basic Altix support in the kernel while
  working out the NUMA aspect.

Modified:
  projects/altix/sys/conf/kern.pre.mk
  projects/altix/sys/conf/ldscript.ia64

Modified: projects/altix/sys/conf/kern.pre.mk
==============================================================================
--- projects/altix/sys/conf/kern.pre.mk	Fri Mar 26 21:22:02 2010	(r205713)
+++ projects/altix/sys/conf/kern.pre.mk	Fri Mar 26 22:04:11 2010	(r205714)
@@ -145,12 +145,12 @@ SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 LD+= -g
 .endif
-.if ${MACHINE_ARCH} != ia64
+.if ${MACHINE_ARCH} == XXX_ALTIX_TODO
+SYSTEM_LDFLAGS= -r
+.else
 SYSTEM_OBJS+= hack.So
 SYSTEM_LDFLAGS= -Bdynamic -T ${LDSCRIPT} -export-dynamic \
 	-dynamic-linker /red/herring
-.else
-SYSTEM_LDFLAGS= -r
 .endif
 SYSTEM_LD= @${LD} ${SYSTEM_LDFLAGS} -warn-common \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o

Modified: projects/altix/sys/conf/ldscript.ia64
==============================================================================
--- projects/altix/sys/conf/ldscript.ia64	Fri Mar 26 21:22:02 2010	(r205713)
+++ projects/altix/sys/conf/ldscript.ia64	Fri Mar 26 22:04:11 2010	(r205714)
@@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-ia64-little", "elf6
 OUTPUT_ARCH(ia64)
 ENTRY(__start)
 SEARCH_DIR(/usr/lib);
-kernel_text = 0xe000000004000000;
+kernel_text = 0xe000003400000000;	/* XXX_ALTIX_TODO */
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */