Author: stepan Date: 2006-06-11 13:03:45 +0200 (Sun, 11 Jun 2006) New Revision: 64
Modified: openbios-devel/arch/sparc64/build.xml openbios-devel/arch/sparc64/openbios.c Log: sparc64 code
Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2006-06-11 10:59:48 UTC (rev 63) +++ openbios-devel/arch/sparc64/build.xml 2006-06-11 11:03:45 UTC (rev 64) @@ -20,14 +20,12 @@ </library>
<executable name="target/arch/sparc64/entry.o" target="target"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/entry.S - ]]></rule> + <rule><![CDATA[ arch/sparc64/entry.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="target/arch/sparc64/vectors.o" target="target"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/vectors.S - ]]></rule> + <rule><![CDATA[ arch/sparc64/vectors.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable>
@@ -36,8 +34,7 @@ $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> + $(STRIP) $@</rule> <object source="plainboot.c"/> <external-object source="target/arch/sparc64/vectors.o"/> <external-object source="target/arch/sparc64/entry.o"/> @@ -57,15 +54,13 @@ @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-sparc64.dict"/> </executable>
<executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/builtin.c - ]]></rule> + <rule><![CDATA[ arch/sparc64/builtin.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> <external-object source="target/include/static-dict.h"/> </executable>
@@ -76,8 +71,7 @@ $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> + $(STRIP) $@</rule> <external-object source="target/arch/sparc64/vectors.o"/> <external-object source="target/arch/sparc64/entry.o"/> <external-object source="target/arch/sparc64/builtin.o"/>
Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2006-06-11 10:59:48 UTC (rev 63) +++ openbios-devel/arch/sparc64/openbios.c 2006-06-11 11:03:45 UTC (rev 64) @@ -31,6 +31,14 @@
int arch_nvram_size;
+void setup_timers() +{ +} + +void udelay() +{ +} + static void init_memory(void) {
@@ -51,6 +59,16 @@ void setup_timers(void);
modules_init(); +#ifdef CONFIG_DRIVER_PCI + ob_pci_init(); +#endif +#ifdef CONFIG_DRIVER_IDE + setup_timers(); + ob_ide_init(); +#endif +#ifdef CONFIG_DRIVER_FLOPPY + ob_floppy_init(); +#endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO init_video(); #endif