Yet another SN update
Sorry I didn't include this in my last set of patches David, but I didn't get it done until just the other day. This patch gives arch/ia64/sn its own Makefile and adds another target to the toplevel ia64 makefile. Hopefully this means that we won't have to bother you with Makefile updates in the future. It also includes some other SN specific fixes that I needed to get a kernel building, linking, and booting in the simulator (almost there!). Only a few, small pieces missing now...
Thanks,
Jesse
arch/ia64/Makefile +7 -5
@@ -50,16 +50,14 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ arch/ia64/hp/common/ arch/ia64/hp/zx1/ \ arch/ia64/hp/sim/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ -core-$(CONFIG_IA64_SGI_SN) += arch/ia64/sn/kernel/ \ - arch/ia64/sn/kernel/sn2/ \ - arch/ia64/sn/io/ \ - arch/ia64/sn/io/sn2/ \ - arch/ia64/sn/io/sn2/pcibr/ +core-$(CONFIG_IA64_SGI_SN) += arch/ia64/sn/ + drivers-$(CONFIG_PCI) += arch/ia64/pci/ drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/ drivers-$(CONFIG_IA64_HP_ZX1) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ boot := arch/ia64/boot +fakeprom := arch/ia64/sn/fakeprom tools := arch/ia64/tools .PHONY: boot compressed include/asm-ia64/offsets.h
@@ -85,10 +83,14 @@ boot: lib/lib.a vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ +fakeprom: + $(Q)$(MAKE) $(build)=$(fakeprom) $@ + include/asm-ia64/offsets.h: include/asm include/linux/version.h include/config/MARKER $(Q)$(MAKE) $(build)=$(tools) $@ define archhelp echo ' compressed - Build compressed kernel image' echo ' boot - Build vmlinux and bootloader for Ski simulator' + echo ' fakeprom - Build fakeprom for Medusa simulator' endef
arch/ia64/sn/Makefile +9 -0
@@ -0,0 +1,9 @@ +# arch/ia64/sn/Makefile +# +# Copyright (C) 1999,2001-2002 Silicon Graphics, Inc. All Rights Reserved. +# + +EXTRA_CFLAGS := -DLITTLE_ENDIAN + +obj-y += kernel/ io/ +
arch/ia64/sn/io/Makefile +8 -5
@@ -13,10 +13,13 @@ EXTRA_CFLAGS += -DSHUB_SWAP_WAR endif -obj-$(CONFIG_IA64_SGI_SN) += stubs.o sgi_if.o xswitch.o klgraph_hack.o \ - hcl.o labelcl.o invent.o sgi_io_sim.o \ - klgraph_hack.o hcl_util.o cdl.o hubdev.o hubspc.o \ - alenlist.o pci.o pci_dma.o ate_utils.o \ - ifconfig_net.o io.o ioconfig_bus.o +#obj-$(CONFIG_IA64_SGI_SN) += stubs.o sgi_if.o xswitch.o klgraph_hack.o \ +# hcl.o labelcl.o invent.o sgi_io_sim.o \ +# klgraph_hack.o hcl_util.o cdl.o hubdev.o hubspc.o \ +# alenlist.o pci.o pci_dma.o ate_utils.o \ +# ifconfig_net.o io.o ioconfig_bus.o + +obj-$(CONFIG_IA64_SGI_SN1) += sn1/ +obj-$(CONFIG_IA64_SGI_SN2) += sn2/ obj-$(CONFIG_PCIBA) += pciba.o
arch/ia64/sn/io/sn2/Makefile +6 -4
@@ -9,10 +9,12 @@ EXTRA_CFLAGS := -DLITTLE_ENDIAN -obj-y += bte_error.o geo_op.o klconflib.o klgraph.o l1.o \ - l1_command.o ml_iograph.o ml_SN_init.o ml_SN_intr.o module.o \ - pci_bus_cvlink.o pciio.o pic.o sgi_io_init.o shub.o shuberror.o \ - shub_intr.o shubio.o xbow.o xtalk.o +#obj-y += pcibr/ bte_error.o geo_op.o klconflib.o klgraph.o l1.o \ +# l1_command.o ml_iograph.o ml_SN_init.o ml_SN_intr.o module.o \ +# pci_bus_cvlink.o pciio.o pic.o sgi_io_init.o shub.o shuberror.o \ +# shub_intr.o shubio.o xbow.o xtalk.o + +obj-y += l1.o l1_command.o obj-$(CONFIG_KDB) += kdba_io.o
arch/ia64/sn/io/sn2/l1_command.c +2 -2
@@ -154,7 +154,7 @@return ret; } - +#ifdef CONFIG_PCI /* * iobrick_module_get_nasid() returns a module_id which has the brick * type encoded in bits 15-12, but this is not the true brick type...
@@ -185,7 +185,7 @@ return -1; /* unknown brick */ } - +#endif int iobrick_module_get_nasid (nasid_t nasid) {int io_moduleid;
arch/ia64/sn/kernel/Makefile +3 -7
@@ -33,14 +33,10 @@ EXTRA_CFLAGS := -DLITTLE_ENDIAN -.S.s: - $(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $< -.S.o: - $(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $< +obj-y := probe.o setup.o sn_asm.o sv.o bte.o iomv.o -obj-y = probe.o setup.o sn_asm.o sv.o bte.o iomv.o -obj-$(CONFIG_IA64_SGI_SN1) += irq.o mca.o -obj-$(CONFIG_IA64_SGI_SN2) += irq.o mca.o +obj-$(CONFIG_IA64_SGI_SN1) += sn1/ irq.o mca.o +obj-$(CONFIG_IA64_SGI_SN2) += sn2/ irq.o mca.o obj-$(CONFIG_IA64_SGI_AUTOTEST) += llsc4.o misctest.o obj-$(CONFIG_IA64_GENERIC) += machvec.o obj-$(CONFIG_MODULES) += sn_ksyms.o
arch/ia64/sn/kernel/setup.c +4 -3
@@ -237,7 +237,7 @@ "%x.%02x\n", SN_SAL_MIN_MAJOR, SN_SAL_MIN_MINOR);panic ("PROM version too old\n" ); } - +#ifdef CONFIG_PCI #ifdef CONFIG_IA64_SGI_SN2 { extern void io_sh_swapper(int, int);
@@ -253,7 +253,7 @@ (void )get_master_baseio_nasid (); }#endif - +#endif /* CONFIG_PCI */ status =ia64_sal_freq_base (SAL_FREQ_BASE_REALTIME_CLOCK , &ticks_per_sec, &drift);if (status !=0 || ticks_per_sec <100000 ) {printk (KERN_WARNING "unable to determine platform RTC clock frequency, guessing.\n" );
@@ -349,7 +349,7 @@for (cnode=0 ; cnode < numnodes; cnode++)memcpy (nodepdaindr[cnode]->pernode_pdaindr, nodepdaindr,sizeof (nodepdaindr)); - +#ifdef CONFIG_PCI /* * Set up IO related platform-dependent nodepda fields. * The following routine actually sets up the hubinfo struct
@@ -359,6 +359,7 @@init_platform_nodepda (nodepdaindr[cnode], cnode); bte_init_node (nodepdaindr[cnode], cnode); } +#endif }/**
arch/ia64/sn/tools/make_textsym +0 -171
171 lines not on this page · raw message
arch/ia64/sn/fakeprom/Makefile +14 -10
@@ -3,18 +3,22 @@ # License. See the file "COPYING" in the main directory of this archive # for more details. # -# Copyright (c) 2000-2001 Silicon Graphics, Inc. All rights reserved. +# Copyright (c) 2000-2003 Silicon Graphics, Inc. All rights reserved. # -obj-y=fpromasm.o main.o fw-emu.o fpmem.o klgraph_init.o +targets-$(CONFIG_IA64_SGI_SN) := fakeprom -fprom: $(OBJ) - $(LD) -static -Tfprom.lds -o fprom $(OBJ) $(LIB) +OBJS := $(obj)/fpromasm.o $(obj)/main.o $(obj)/fw-emu.o $(obj)/fpmem.o \ + $(obj)/klgraph_init.o -.S.o: - $(CC) -D__ASSEMBLY__ $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $< -.c.o: - $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -c -o $*.o $< +fakeprom: $(obj)/fakeprom $(obj)/vmlinux.sym + cp $(obj)/fakeprom $(obj)/fprom -clean: - rm -f *.o fprom +LDFLAGS_fakeprom = -static -T + +$(obj)/fakeprom: $(src)/fprom.lds $(OBJS) arch/ia64/lib/lib.a + $(call if_changed,ld) + +$(obj)/vmlinux.sym: $(src)/make_textsym System.map + $(src)/make_textsym vmlinux > vmlinux.sym + $(call cmd,cptotop)
arch/ia64/sn/fakeprom/README +32 -0
@@ -1,3 +1,35 @@ +/* + * Copyright (c) 2002-2003 Silicon Graphics, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Further, this software is distributed without any warranty that it is + * free of the rightful claim of any third person regarding infringement + * or the like. Any license provided herein, whether implied or + * otherwise, applies only to this software file. Patent licenses, if + * any, provided herein do not apply to combinations of this program with + * other software, or any other product whatsoever. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. + * + * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, + * Mountain View, CA 94043, or: + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * + * http://oss.sgi.com/projects/GenInfo/NoticeExplan + */ + This directory contains the files required to build the fake PROM image that is currently being used to boot IA64 kernels running under the SGI Medusa kernel.
arch/ia64/sn/fakeprom/fpmem.c +21 -9
@@ -4,7 +4,7 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* Copyright (C) 2000-2002 Silicon Graphics, Inc. All rights reserved. +* Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved. */
@@ -168,13 +168,13 @@#endif void -build_mem_desc (efi_memory_desc_t *md,int type,long paddr,long numbytes) +build_mem_desc (efi_memory_desc_t *md,int type,long paddr,long numbytes,long attr) { md->type = type; md->phys_addr = paddr; md->virt_addr =0 ; md->num_pages = numbytes >>12 ; - md->attribute =EFI_MEMORY_WB ; + md->attribute = attr; }int
@@ -236,28 +236,40 @@*/ if (bank ==0 ) {if (cnode ==0 ) { + hole =2 *1024 *1024 ; +build_mem_desc (md,EFI_PAL_CODE , paddr, hole,EFI_MEMORY_WB |EFI_MEMORY_WB ); + numbytes -= hole; + paddr += hole; + count++ ; + md += mdsize; hole =1 *1024 *1024 ; -build_mem_desc (md,EFI_PAL_CODE , paddr, hole); +build_mem_desc (md,EFI_CONVENTIONAL_MEMORY , paddr, hole,EFI_MEMORY_UC ); numbytes -= hole; paddr += hole; count++ ; md += mdsize; - hole =3 *1024 *1024 ; -build_mem_desc (md,EFI_RUNTIME_SERVICES_DATA , paddr, hole); + hole =1 *1024 *1024 ; +build_mem_desc (md,EFI_RUNTIME_SERVICES_DATA , paddr, hole,EFI_MEMORY_WB |EFI_MEMORY_WB ); numbytes -= hole; paddr += hole; count++ ; md += mdsize; }else { - hole =PROMRESERVED_SIZE ; -build_mem_desc (md,EFI_RUNTIME_SERVICES_DATA , paddr, hole); + hole =2 *1024 *1024 ; +build_mem_desc (md,EFI_RUNTIME_SERVICES_DATA , paddr, hole,EFI_MEMORY_WB |EFI_MEMORY_WB ); + numbytes -= hole; + paddr += hole; + count++ ; + md += mdsize; + hole =2 *1024 *1024 ; +build_mem_desc (md,EFI_RUNTIME_SERVICES_DATA , paddr, hole,EFI_MEMORY_UC ); numbytes -= hole; paddr += hole; count++ ; md += mdsize; } } -build_mem_desc (md,EFI_CONVENTIONAL_MEMORY , paddr, numbytes); +build_mem_desc (md,EFI_CONVENTIONAL_MEMORY , paddr, numbytes,EFI_MEMORY_WB |EFI_MEMORY_WB ); md += mdsize ; count++ ;
arch/ia64/sn/fakeprom/fprom.lds +31 -0
@@ -1,3 +1,34 @@ +/* + * Copyright (c) 2002-2003 Silicon Graphics, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Further, this software is distributed without any warranty that it is + * free of the rightful claim of any third person regarding infringement + * or the like. Any license provided herein, whether implied or + * otherwise, applies only to this software file. Patent licenses, if + * any, provided herein do not apply to combinations of this program with + * other software, or any other product whatsoever. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. + * + * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, + * Mountain View, CA 94043, or: + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * + * http://oss.sgi.com/projects/GenInfo/NoticeExplan + */ OUTPUT_FORMAT("elf64-ia64-little") OUTPUT_ARCH(ia64)
arch/ia64/sn/fakeprom/make_textsym +171 -0
171 lines not on this page · raw message
On Wed, Mar 05, 2003 at 04:12:49PM -0800, Jesse Barnes wrote:
Hi Jesse.
From a Makefile perspective it looks like you have made a really good job. A few comments - see below.
Sam
arch/ia64/Makefile line 87
Quoted 4 lines
arch/ia64/Makefile +3
-0+fakeprom := arch/ia64/sn/fakeprom +fakeprom: + $(Q)$(MAKE) $(build)=$(fakeprom) $@
Usually I use the rule to convert to full path in arch/$(ARCH)/Makefile
The following is preferred assuming you generate file named fakeprom.
arch/ia64/sn/fakeprom/Makefile line 9
Quoted 9 lines
(quoted diff) +1
-0+ $(Q)$(MAKE) $(build)=$(fakeprom) $(fakeprom)/$@diff -Naru linux-2.5.60-ia64-sn/arch/ia64/sn/fakeprom/Makefile work-sn2/arch/ia64/sn/fakeprom/Makefile
arch/ia64/sn/fakeprom/Makefile +1
-1-obj-y=fpromasm.o main.o fw-emu.o fpmem.o klgraph_init.o +targets-$(CONFIG_IA64_SGI_SN) := fakeprom
Cannot (from the patch) see the purpose of this assignment.
arch/ia64/sn/fakeprom/Makefile line 15
Quoted 11 lines
arch/ia64/sn/fakeprom/Makefile +4
-6-fprom: $(OBJ) - $(LD) -static -Tfprom.lds -o fprom $(OBJ) $(LIB) +OBJS := $(obj)/fpromasm.o $(obj)/main.o $(obj)/fw-emu.o $(obj)/fpmem.o \ + $(obj)/klgraph_init.o -.S.o: - $(CC) -D__ASSEMBLY__ $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $< -.c.o: - $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -c -o $*.o $< +fakeprom: $(obj)/fakeprom $(obj)/vmlinux.sym + cp $(obj)/fakeprom $(obj)/fprom
$(obj)/fprom is a target here.
arch/ia64/sn/fakeprom/Makefile line 20
Quoted 3 lines
arch/ia64/sn/fakeprom/Makefile +3
-0+ +$(obj)/fakeprom: $(src)/fprom.lds $(OBJS) arch/ia64/lib/lib.a + $(call if_changed,ld)
You must add FORCE as prerequisite, otherwise it will not work as expected. All targets used must be listed in: EXTRA_TARGETSEXTRA_TARGETS := fprom fakeprom vmlinux.sym