[Xen-changelog] sn2 console patch

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1668.1.9, 2005/06/09 15:44:17-06:00, djm@xxxxxxxxxxxxxxx

        sn2 console patch
        Signed-off-by: Greg Edwards <edwardsg@xxxxxxx>



 arch/ia64/Makefile          |    3 ++-
 arch/ia64/acpi.c            |    4 +++-
 arch/ia64/tools/mkbuildtree |    7 +++++++
 include/asm-ia64/config.h   |    1 +
 4 files changed, 13 insertions(+), 2 deletions(-)


diff -Nru a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile    2005-06-10 14:04:34 -04:00
+++ b/xen/arch/ia64/Makefile    2005-06-10 14:04:34 -04:00
@@ -9,7 +9,8 @@
        xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
        extable.o linuxextable.o xenirq.o xentime.o \
        regionreg.o entry.o unaligned.o privop.o vcpu.o \
-       irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o
+       irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
+       sn_console.o
 
 ifeq ($(CONFIG_VTI),y)
 OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o \
diff -Nru a/xen/arch/ia64/acpi.c b/xen/arch/ia64/acpi.c
--- a/xen/arch/ia64/acpi.c      2005-06-10 14:04:34 -04:00
+++ b/xen/arch/ia64/acpi.c      2005-06-10 14:04:34 -04:00
@@ -68,7 +68,7 @@
 const char *
 acpi_get_sysname (void)
 {
-#ifdef CONFIG_IA64_GENERIC
+/* #ifdef CONFIG_IA64_GENERIC */
        unsigned long rsdp_phys;
        struct acpi20_table_rsdp *rsdp;
        struct acpi_table_xsdt *xsdt;
@@ -101,6 +101,7 @@
        }
 
        return "dig";
+/*
 #else
 # if defined (CONFIG_IA64_HP_SIM)
        return "hpsim";
@@ -114,6 +115,7 @@
 #      error Unknown platform.  Fix acpi.c.
 # endif
 #endif
+*/
 }
 
 #ifdef CONFIG_ACPI_BOOT
diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree   2005-06-10 14:04:34 -04:00
+++ b/xen/arch/ia64/tools/mkbuildtree   2005-06-10 14:04:34 -04:00
@@ -45,6 +45,7 @@
 mkdir include/asm-generic
 mkdir include/asm-ia64/linux
 mkdir include/asm-ia64/linux/byteorder
+mkdir include/asm-ia64/sn
 # use "gcc -Iinclude/asm-ia64" to find these linux includes
 #ln -s $XEN/include/xen $XEN/include/linux
 #ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
@@ -197,6 +198,12 @@
 null include/asm-ia64/module.h
 null include/asm-ia64/ia32.h
 null include/asm-ia64/tlbflush.h
+
+null include/asm-ia64/sn/arch.h
+null include/asm-ia64/sn/geo.h
+null include/asm-ia64/sn/nodepda.h
+null include/asm-ia64/sn/sn_cpuid.h
+cp_patch include/asm-ia64/sn/sn_sal.h include/asm-ia64/sn/sn_sal.h sn_sal.h
 
 softlink include/asm-ia64/acpi.h include/asm-ia64/acpi.h
 softlink include/asm-ia64/asmmacro.h include/asm-ia64/asmmacro.h
diff -Nru a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     2005-06-10 14:04:34 -04:00
+++ b/xen/include/asm-ia64/config.h     2005-06-10 14:04:34 -04:00
@@ -19,6 +19,7 @@
 #define        CONFIG_IA64_GRANULE_16MB
 
 #define CONFIG_EFI_PCDP
+#define CONFIG_SERIAL_SGI_L1_CONSOLE
 
 #ifndef __ASSEMBLY__
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog