OpenBIOS January 2009

openbios@openbios.org

14 participants
148 discussions

Sparc32 "see" crashes on "" literals
by Mark Cave-Ayland 25 Jan '09

25 Jan '09

Hi all, Having been looking at the OpenBIOS Sparc implementation recently, I came across the following interesting reproducible test case with latest SVN of Qemu and openbios: ./qemu-system-sparc -nographic -serial stdio Configuration device id QEMU version 1 machine id 32 UUID: 00000000-0000-0000-0000-000000000000 CPUs: 1 x FMI,MB86904 Welcome to OpenBIOS v1.0RC1 built on Jan 24 2009 10:08 Type 'help' for detailed information [sparc] Booting file 'disk' with parameters '' Trying disk (disk) Trying disk:d (disk:d) Unsupported image format 0 > see see : see ' (see) ; ok 0 > see test-all : test-all active-package cr (lit) (lit) then Unhandled Exception 0x00000009 PC = 0xffd066c4 NPC = 0xffd066c8 Stopping execution Similarly I see the same error in get-package-path too: 0 > see get-package-path : get-package-path ?dup 0= if 0 0 dup >dn.parent @ 0= if drop (lit) (lit) then Unhandled Exception 0x00000009 PC = 0xffd066c4 NPC = 0xffd066c8 Stopping execution AFAICT the problem is related to the occurence of string constants like "foo" or "bar" in the source code. Does anyone else see this on other platforms? I suspect given that forth is interpreted that this is a lower-level issue of some kind... ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

3 5

r425 - in openbios-devel: arch/sparc32 arch/x86 drivers include/openbios include/sparc32
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 10:56:08 +0100 (Sun, 25 Jan 2009) New Revision: 425 Modified: openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/x86/openbios.c openbios-devel/drivers/floppy.c openbios-devel/drivers/obio.c openbios-devel/drivers/pci.c openbios-devel/include/openbios/drivers.h openbios-devel/include/sparc32/io.h Log: Add support for floppy boot on Sparc32 Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/arch/sparc32/openbios.c 2009-01-25 09:56:08 UTC (rev 425) @@ -14,6 +14,7 @@ #include "openbios/kernel.h" #include "openbios/stack.h" #include "openbios/nvram.h" +#include "../../drivers/timer.h" // XXX #include "sys_info.h" #include "openbios.h" #include "boot.h" @@ -98,6 +99,18 @@ static const struct hwdef *hwdef; +void setup_timers(void) +{ +} + +void udelay(unsigned int usecs) +{ +} + +void mdelay(unsigned int msecs) +{ +} + static void init_memory(void) { memory = malloc(MEMORY_SIZE); Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/arch/x86/openbios.c 2009-01-25 09:56:08 UTC (rev 425) @@ -48,7 +48,7 @@ ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); #endif #ifdef CONFIG_DRIVER_FLOPPY - ob_floppy_init("/isa", "floppy0"); + ob_floppy_init("/isa", "floppy0", 0x3f0, 0); #endif #ifdef CONFIG_XBOX init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/drivers/floppy.c 2009-01-25 09:56:08 UTC (rev 425) @@ -20,22 +20,18 @@ #endif #define printk_err printk -#ifndef FD_BASE -#define FD_BASE 0x3f0 -#endif - #define FD_DRIVE 0 -#define FD_STATUS_A (FD_BASE + 0) /* Status register A */ -#define FD_STATUS_B (FD_BASE + 1) /* Status register B */ -#define FD_DOR (FD_BASE + 2) /* Digital Output Register */ -#define FD_TDR (FD_BASE + 3) /* Tape Drive Register */ -#define FD_STATUS (FD_BASE + 4) /* Main Status Register */ -#define FD_DSR (FD_BASE + 4) /* Data Rate Select Register (old) */ -#define FD_DATA (FD_BASE + 5) /* Data Transfer (FIFO) register */ -#define FD_DIR (FD_BASE + 7) /* Digital Input Register (read) */ -#define FD_DCR (FD_BASE + 7) /* Diskette Control Register (write)*/ +#define FD_STATUS_A (0) /* Status register A */ +#define FD_STATUS_B (1) /* Status register B */ +#define FD_DOR (2) /* Digital Output Register */ +#define FD_TDR (3) /* Tape Drive Register */ +#define FD_STATUS (4) /* Main Status Register */ +#define FD_DSR (4) /* Data Rate Select Register (old) */ +#define FD_DATA (5) /* Data Transfer (FIFO) register */ +#define FD_DIR (7) /* Digital Input Register (read) */ +#define FD_DCR (7) /* Diskette Control Register (write)*/ /* Bit of FD_STATUS_A */ #define STA_INT_PENDING 0x80 /* Interrupt Pending */ @@ -210,10 +206,12 @@ int dtr; unsigned char dor; unsigned char version; /* FDC version code */ + void (*fdc_outb)(unsigned char data, unsigned long port); + unsigned char (*fdc_inb)(unsigned long port); + unsigned long io_base; + unsigned long mmio_base; } fdc_state; - - /* Synchronization of FDC access. */ #define FD_COMMAND_NONE -1 #define FD_COMMAND_ERROR 2 @@ -227,7 +225,36 @@ static void show_floppy(void); static void floppy_reset(void); +/* + * IO port operations + */ +static unsigned char +ob_fdc_inb(unsigned long port) +{ + return inb(fdc_state.io_base + port); +} +static void +ob_fdc_outb(unsigned char data, unsigned long port) +{ + outb(data, fdc_state.io_base + port); +} + +/* + * MMIO operations + */ +static unsigned char +ob_fdc_mmio_readb(unsigned long port) +{ + return *(unsigned char *)(fdc_state.mmio_base + port); +} + +static void +ob_fdc_mmio_writeb(unsigned char data, unsigned long port) +{ + *(unsigned char *)(fdc_state.mmio_base + port) = data; +} + static int set_dor(char mask, char data) { unsigned char newdor,olddor; @@ -236,7 +263,7 @@ newdor = (olddor & mask) | data; if (newdor != olddor){ fdc_state.dor = newdor; - outb(newdor, FD_DOR); + fdc_state.fdc_outb(newdor, FD_DOR); } return olddor; } @@ -246,7 +273,7 @@ { int counter, status; for (counter = 0; counter < 10000; counter++) { - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); if (status & STATUS_READY) { return status; } @@ -265,7 +292,7 @@ if ((status = wait_til_ready()) < 0) return status; if ((status & (STATUS_READY|STATUS_DIR|STATUS_NON_DMA)) == STATUS_READY){ - outb(byte,FD_DATA); + fdc_state.fdc_outb(byte,FD_DATA); return 0; } printk_debug("Unable to send byte %x to FDC_STATE. Status=%x\n", @@ -288,7 +315,7 @@ return i; } if (status == (STATUS_DIR|STATUS_READY|STATUS_BUSY)) - reply_buffer[i] = inb(FD_DATA); + reply_buffer[i] = fdc_state.fdc_inb(FD_DATA); else break; } @@ -366,7 +393,7 @@ } max_sensei--; }while(((reply_buffer[0] & 0x83) != FD_DRIVE) && (nr == 2) && max_sensei); - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); printk_debug("status = %x, reply_buffer=", status); for(i = 0; i < nr; i++) { printk_debug(" %x", @@ -405,7 +432,7 @@ mdelay(DRIVE_H1440_SPINUP); - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); printk_debug("set_drive status = %02x, new_dor = %02x\n", status, new_dor); if (status != STATUS_READY) { @@ -440,7 +467,7 @@ return; /* Set dtr */ - outb(rate, FD_DCR); + fdc_state.fdc_outb(rate, FD_DCR); /* TODO: some FDC/drive combinations (C&T 82C711 with TEAC 1.2MB) * need a stabilization period of several milliseconds to be @@ -586,11 +613,11 @@ /* Irrelevant for systems with true DMA (i386). */ if (fdc_state.version >= FDC_82072A) - outb(0x80 | (fdc_state.dtr &3), FD_DSR); + fdc_state.fdc_outb(0x80 | (fdc_state.dtr &3), FD_DSR); else { - outb(fdc_state.dor & ~DOR_NO_RESET, FD_DOR); + fdc_state.fdc_outb(fdc_state.dor & ~DOR_NO_RESET, FD_DOR); udelay(FD_RESET_DELAY); - outb(fdc_state.dor, FD_DOR); + fdc_state.fdc_outb(fdc_state.dor, FD_DOR); } result(reply, MAX_REPLIES); } @@ -605,11 +632,14 @@ printk_debug("-------------------\n"); printk_debug("fdc_bytes: %02x %02x xx %02x %02x %02x xx %02x\n", - inb(FD_BASE + 0), inb(FD_BASE + 1), - inb(FD_BASE + 3), inb(FD_BASE + 4), inb(FD_BASE + 5), - inb(FD_BASE + 7)); + fdc_state.fdc_inb(FD_STATUS_A), + fdc_state.fdc_inb(FD_STATUS_B), + fdc_state.fdc_inb(FD_TDR), + fdc_state.fdc_inb(FD_STATUS), + fdc_state.fdc_inb(FD_DATA), + fdc_state.fdc_inb(FD_DIR)); - printk_debug("status=%x\n", inb(FD_STATUS)); + printk_debug("status=%x\n", fdc_state.fdc_inb(FD_STATUS)); printk_debug("\n"); } @@ -719,7 +749,7 @@ printk_debug("nr = %d\n", nr); printk_debug("ST0 = %02x\n", reply[0]); printk_debug("PCN = %02x\n", reply[1]); - printk_debug("status = %d\n", inb(FD_STATUS)); + printk_debug("status = %d\n", fdc_state.fdc_inb(FD_STATUS)); } return success; } @@ -818,7 +848,7 @@ /* The execution stage begins when STATUS_READY&STATUS_NON_DMA is set */ do { - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); status &= STATUS_READY | STATUS_NON_DMA; } while(status != (STATUS_READY|STATUS_NON_DMA)); @@ -831,7 +861,7 @@ if (status != (STATUS_READY|STATUS_DIR|STATUS_NON_DMA)) { break; } - byte = inb(FD_DATA); + byte = fdc_state.fdc_inb(FD_DATA); if ((i >= byte_offset) && (i < end_offset)) { dest[i - byte_offset] = byte; } @@ -839,12 +869,12 @@ bytes_read = i; /* The result stage begins when STATUS_NON_DMA is cleared */ - while((status = inb(FD_STATUS)) & STATUS_NON_DMA) { + while((status = fdc_state.fdc_inb(FD_STATUS)) & STATUS_NON_DMA) { /* We get extra bytes in the fifo past * the end of the sector and drop them on the floor. * Otherwise the fifo is polluted. */ - inb(FD_DATA); + fdc_state.fdc_inb(FD_DATA); } /* Did I get an error? */ result_ok = read_ok(head); @@ -995,7 +1025,7 @@ } /* get_fdc_version */ -static int floppy_init(void) +static int floppy_init(unsigned long io_base, unsigned long mmio_base) { printk_debug("floppy_init\n"); fdc_state.in_sync = 0; @@ -1004,6 +1034,15 @@ fdc_state.dtr = -1; fdc_state.dor = DOR_NO_RESET; fdc_state.version = FDC_UNKNOWN; + if (mmio_base) { + fdc_state.fdc_inb = ob_fdc_mmio_readb; + fdc_state.fdc_outb = ob_fdc_mmio_writeb; + } else { + fdc_state.fdc_inb = ob_fdc_inb; + fdc_state.fdc_outb = ob_fdc_outb; + } + fdc_state.io_base = io_base; + fdc_state.mmio_base = mmio_base; reset_fdc(); /* Try to determine the floppy controller type */ fdc_state.version = get_fdc_version(); @@ -1032,10 +1071,10 @@ } static void -ob_floppy_initialize(int *idx) +ob_floppy_initialize(const char *path) { int props[3]; - phandle_t ph=get_cur_dev(); + phandle_t ph = find_dev(path); push_str("block"); fword("device-type"); @@ -1103,7 +1142,6 @@ } NODE_METHODS(ob_floppy) = { - { NULL, ob_floppy_initialize }, { "open", ob_floppy_open }, { "close", ob_floppy_close }, { "read-blocks", ob_floppy_read_blocks }, @@ -1112,12 +1150,19 @@ }; -int ob_floppy_init(const char *path, const char *dev_name) +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base) { char nodebuff[128]; snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); - REGISTER_NAMED_NODE(ob_floppy, nodebuff); - floppy_init(); + if (!mmio_base) { + REGISTER_NAMED_NODE(ob_floppy, nodebuff); + ob_floppy_initialize(nodebuff); + } else { + // Already in tree and mapped + REGISTER_NODE_METHODS(ob_floppy, nodebuff); + } + floppy_init(io_base, mmio_base); return 0; } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/drivers/obio.c 2009-01-25 09:56:08 UTC (rev 425) @@ -969,12 +969,18 @@ static void ob_fd_init(uint64_t base, uint64_t offset, int intr) { + unsigned long addr; + ob_new_obio_device("SUNW,fdtwo", "block"); - ob_reg(base, offset, FD_REGS, 0); + addr = ob_reg(base, offset, FD_REGS, 1); ob_intr(intr); + fword("is-deblocker"); + + ob_floppy_init("/obio", "SUNW,fdtwo", 0, addr); + fword("finish-device"); } Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/drivers/pci.c 2009-01-25 09:56:08 UTC (rev 425) @@ -443,7 +443,7 @@ { #ifdef CONFIG_DRIVER_EBUS #ifdef CONFIG_DRIVER_FLOPPY - ob_floppy_init(config->path, "fdthree"); + ob_floppy_init(config->path, "fdthree", 0x3f0ULL, 0); #endif #ifdef CONFIG_DRIVER_PC_SERIAL ob_pc_serial_init(config->path, "su", arch->io_base, 0x3f8ULL, 0); Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/include/openbios/drivers.h 2009-01-25 09:56:08 UTC (rev 425) @@ -86,7 +86,8 @@ extern char boot_device; #endif #ifdef CONFIG_DRIVER_FLOPPY -int ob_floppy_init(const char *path, const char *dev_name); +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base); #endif #ifdef CONFIG_DRIVER_PC_KBD void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/include/sparc32/io.h 2009-01-25 09:56:08 UTC (rev 425) @@ -61,7 +61,7 @@ { int ret; - __asm__ __volatile__("lduba [%1] 0x20, %0\n\t" + __asm__ __volatile__("ldub [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -70,7 +70,7 @@ static inline void out_8(volatile unsigned char *addr, int val) { - __asm__ __volatile__("stba %0, [%1] 0x20\n\t" + __asm__ __volatile__("stb %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } @@ -80,7 +80,7 @@ int ret; // XXX - __asm__ __volatile__("lduha [%1] 0x20, %0\n\t" + __asm__ __volatile__("lduh [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -91,7 +91,7 @@ { int ret; - __asm__ __volatile__("lduha [%1] 0x20, %0\n\t" + __asm__ __volatile__("lduh [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -101,14 +101,14 @@ static inline void out_le16(volatile unsigned short *addr, int val) { // XXX - __asm__ __volatile__("stha %0, [%1] 0x20\n\t" + __asm__ __volatile__("sth %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } static inline void out_be16(volatile unsigned short *addr, int val) { - __asm__ __volatile__("stha %0, [%1] 0x20\n\t" + __asm__ __volatile__("sth %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } @@ -118,7 +118,7 @@ unsigned ret; // XXX - __asm__ __volatile__("lda [%1] 0x20, %0\n\t" + __asm__ __volatile__("ld [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -129,7 +129,7 @@ { unsigned ret; - __asm__ __volatile__("lda [%1] 0x20, %0\n\t" + __asm__ __volatile__("ld [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -139,14 +139,14 @@ static inline void out_le32(volatile unsigned *addr, int val) { // XXX - __asm__ __volatile__("sta %0, [%1] 0x20\n\t" + __asm__ __volatile__("st %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } static inline void out_be32(volatile unsigned *addr, int val) { - __asm__ __volatile__("sta %0, [%1] 0x20\n\t" + __asm__ __volatile__("st %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); }

1 0

r424 - openbios-devel/arch/sparc64
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 08:31:15 +0100 (Sun, 25 Jan 2009) New Revision: 424 Modified: openbios-devel/arch/sparc64/tree.fs Log: Add UPA decode and encode methods Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2009-01-25 07:30:45 UTC (rev 423) +++ openbios-devel/arch/sparc64/tree.fs 2009-01-25 07:31:15 UTC (rev 424) @@ -1,11 +1,29 @@ +\ ------------------------------------------------------------------------- +\ UPA encode/decode unit +\ ------------------------------------------------------------------------- +: decode-unit-upa ( str len -- id lun ) + ascii , left-split + ( addr-R len-R addr-L len-L ) + parse-hex + -rot parse-hex + swap +; + +: encode-unit-upa ( id lun -- str len) + swap + pocket tohexstr + " ," pocket tmpstrcat >r + rot pocket tohexstr r> tmpstrcat drop +; + " /" find-device 2 encode-int " #address-cells" property 2 encode-int " #size-cells" property " sun4u" encode-string " compatible" property - \ : encode-unit encode-unit-sbus ; - \ : decode-unit decode-unit-sbus ; + : encode-unit encode-unit-upa ; + : decode-unit decode-unit-upa ; new-device " memory" device-name

1 0

r423 - openbios-devel/arch/sparc64
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 08:30:45 +0100 (Sun, 25 Jan 2009) New Revision: 423 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix Sabre device ID Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-24 08:23:33 UTC (rev 422) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-25 07:30:45 UTC (rev 423) @@ -65,7 +65,7 @@ .pci = { .name = "SUNW,sabre", .vendor_id = 0x108e, - .device_id = 0xa000, + .device_id = 0x5000, .cfg_addr = APB_SPECIAL_BASE + 0x1000000ULL, .cfg_data = APB_MEM_BASE, .cfg_base = 0x80000000ULL,

1 0

Re: [OpenBIOS] [sparc64] Problematic pci at 0 and pci nodes in the device tree
by Mark Cave-Ayland 24 Jan '09

24 Jan '09

Hi Blue Swirl, > First, you need binutils and gcc. For cross compiling I'd recommend > sparc64-elf target, then you avoid a lot of unneeded Linux > headers/libgcc stuff. At least binutils 2.18 and gcc 4.2.4 build > working binaries. I still don't have a working cross gdb for Sparc64, > the obvious configuration (--target=sparc64-elf) doesn't work. I now have a cross-compile environment setup after a lot of effort. The hardest part was building a cross-gdb for Sparc64 as all I ever received was the "Reply packet too long error". I ended up spending about half a day going through the gdb sources until I found that unless you specify a platform with configure when you come to build gdb, the extra 64-bit register sets don't get built in! In the end, I went for "./configure --target=sparc64-linux" and magically everything started to work. If I build and install the non-stripped Sparc64 OpenBIOS built-in image, I can then do this: qemu-system-sparc64 .... -s -S sparc64-linux-gdb (gdb) file openbios-sparc64 Reading symbols from openbios-sparc64...done. (gdb) break openbios Breakpoint 1 at 0xffd0d014: file arch/sparc64/openbios.c, line 516. (gdb) target remote :1234 Remote debugging using :1234 [New Thread 1] 0x000001fff0000020 in ?? () (gdb) cont Continuing. Breakpoint 1, openbios () at arch/sparc64/openbios.c:516 516 const struct hwdef *hwdef = NULL; Cool :) ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

2 1

r422 - in openbios-devel: config/examples include/libc libc
by svn＠openbios.org 24 Jan '09

24 Jan '09

Author: blueswirl Date: 2009-01-24 09:23:33 +0100 (Sat, 24 Jan 2009) New Revision: 422 Modified: openbios-devel/config/examples/sparc64_rules.xml openbios-devel/include/libc/string.h openbios-devel/libc/misc.c Log: Add Propolice support Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-01-24 07:31:45 UTC (rev 421) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-01-24 08:23:33 UTC (rev 422) @@ -38,10 +38,6 @@ INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g -ifeq ($(shell uname), OpenBSD) - CFLAGS+= -fno-stack-protector -endif - # # pre rules # Modified: openbios-devel/include/libc/string.h =================================================================== --- openbios-devel/include/libc/string.h 2009-01-24 07:31:45 UTC (rev 421) +++ openbios-devel/include/libc/string.h 2009-01-24 08:23:33 UTC (rev 422) @@ -99,4 +99,9 @@ extern int errno_int; +// Propolice support +extern long __guard[8]; + +void __stack_smash_handler(const char *func, int damaged); + #endif /* _H_STRING */ Modified: openbios-devel/libc/misc.c =================================================================== --- openbios-devel/libc/misc.c 2009-01-24 07:31:45 UTC (rev 421) +++ openbios-devel/libc/misc.c 2009-01-24 08:23:33 UTC (rev 422) @@ -75,3 +75,24 @@ return sum * sign; } + +// Propolice support +long __guard[8] = { +#ifdef CONFIG_BIG_ENDIAN + (0 << 24) | (0 << 16) | ('\n' << 8) | 255, +#else + (255 << 24) | ('\n' << 16) | (0 << 8) | 0, +#endif + 0, 0, 0, 0, 0, 0, 0 +}; + +void __stack_smash_handler(const char *func, int damaged) +{ + printk("Propolice detected a stack smashing attack %x at function %s," + " freezing\n", damaged, func); + + // Freeze + // XXX: Disable interrupts? + for(;;) + ; +}

1 0

r421 - openbios-devel/drivers
by svn＠openbios.org 24 Jan '09

24 Jan '09

Author: blueswirl Date: 2009-01-24 08:31:45 +0100 (Sat, 24 Jan 2009) New Revision: 421 Modified: openbios-devel/drivers/obio.c Log: Add slavioconfig only for SS-4, SS-5 and S3GX Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-23 20:09:26 UTC (rev 420) +++ openbios-devel/drivers/obio.c 2009-01-24 07:31:45 UTC (rev 421) @@ -116,7 +116,7 @@ } static void -ob_eccmemctl_init(void) +ob_eccmemctl_init(uint64_t base) { uint32_t version, *regs; const char *mc_type; @@ -535,17 +535,27 @@ for (;;); } -static void dummy_mach_init(void) +static void dummy_mach_init(uint64_t base) { } +static void +ss5_init(uint64_t base) +{ + ob_new_obio_device("slavioconfig", NULL); + + ob_reg(base, SLAVIO_SCONFIG, SCONFIG_REGS, 0); + + fword("finish-device"); +} + struct machdef { uint16_t machine_id; const char *banner_name; const char *model; const char *name; int mid_offset; - void (*initfn)(void); + void (*initfn)(uint64_t base); }; static const struct machdef sun4m_defs[] = { @@ -555,7 +565,7 @@ .model = "SUNW,501-3059", .name = "SUNW,SPARCstation-5", .mid_offset = 0, - .initfn = dummy_mach_init, + .initfn = ss5_init, }, { .machine_id = 33, @@ -579,7 +589,7 @@ .model = "SUNW,501-2572", .name = "SUNW,SPARCstation-4", .mid_offset = 0, - .initfn = dummy_mach_init, + .initfn = ss5_init, }, { .machine_id = 36, @@ -595,7 +605,7 @@ .model = "S3", .name = "Tadpole_S3GX", .mid_offset = 0, - .initfn = dummy_mach_init, + .initfn = ss5_init, }, { .machine_id = 64, @@ -768,8 +778,6 @@ mach = id_machine(machine_id); - mach->initfn(); - push_str(mach->banner_name); fword("encode-string"); push_str("banner-name"); @@ -786,6 +794,8 @@ push_str("name"); fword("property"); + mach->initfn(base); + // Add cpus temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); @@ -968,18 +978,7 @@ fword("finish-device"); } - static void -ob_sconfig_init(uint64_t base, uint64_t offset) -{ - ob_new_obio_device("slavioconfig", NULL); - - ob_reg(base, offset, SCONFIG_REGS, 0); - - fword("finish-device"); -} - -static void ob_auxio_init(uint64_t base, uint64_t offset) { ob_new_obio_device("auxio", NULL); @@ -1262,8 +1261,6 @@ if (fd_offset != (unsigned long) -1) ob_fd_init(slavio_base, fd_offset, FD_INTR); - ob_sconfig_init(slavio_base, SLAVIO_SCONFIG); - ob_auxio_init(slavio_base, aux1_offset); if (aux2_offset != (unsigned long) -1)

1 0

sparc32 node order different than openboot
by Robert Reif 24 Jan '09

24 Jan '09

Something that has bugged me for a while is that the current nodes children are listed in reverse order compared to suns openboot. Doing an ls produces generally the same names but in reverse order from sun.

1 0

r420 - in openbios-devel: . arch/ppc arch/sparc32 arch/sparc64 arch/x86 config/examples config/scripts config/xml fs/hfs fs/hfsplus
by svn＠openbios.org 23 Jan '09

23 Jan '09

Author: blueswirl Date: 2009-01-23 21:09:26 +0100 (Fri, 23 Jan 2009) New Revision: 420 Modified: openbios-devel/Makefile openbios-devel/arch/ppc/build.xml openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc64/build.xml openbios-devel/arch/x86/build.xml openbios-devel/config/examples/amd64_rules.xml openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/cross-x86_rules.xml openbios-devel/config/examples/ppc_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml openbios-devel/config/examples/x86_rules.xml openbios-devel/config/scripts/switch-arch openbios-devel/config/xml/dictionary.xsl openbios-devel/config/xml/makefile.xsl openbios-devel/config/xml/object.xsl openbios-devel/config/xml/util.xsl openbios-devel/fs/hfs/build.xml openbios-devel/fs/hfsplus/build.xml Log: Add support for configuring for multiple targets Modified: openbios-devel/Makefile =================================================================== --- openbios-devel/Makefile 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/Makefile 2009-01-23 20:09:26 UTC (rev 420) @@ -1,96 +1,36 @@ -ARCH= $(shell test -r rules.xml && cat rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ ) HOSTARCH=$(shell config/scripts/archname) -CROSSCFLAGS=$(shell config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -ODIR=obj-$(ARCH) +ODIRS=$(wildcard obj-*) +TARGETS=$(subst obj-,,$(ODIRS)) -all: requirements archtest info build +all: requirements info build -archtest: prepare - @test -r config.xml -a -r rules.xml || \ - ( echo ; echo "Please run the following command first:"; echo ; \ - echo " $$ config/scripts/switch-arch <arch>"; \ - echo; echo "<arch> can be one out of x86, amd64, cross-ppc, ppc"; \ - echo " cross-sparc32, sparc32, cross-sparc64, sparc64"; \ - echo; exit 1 ) - requirements: - @which toke &>/dev/null || ( echo ; echo "Please install the OpenBIOS fcode utilities."; \ - echo; echo "Download with :"; \ - echo " $$ svn co svn://openbios.org/openbios/fcode-utils"; \ - echo; exit 1 ) @which xsltproc &>/dev/null || ( echo ; echo "Please install libxslt2"; \ echo; exit 1 ) info: - @echo "Building OpenBIOS on $(HOSTARCH) for $(ARCH)" + @echo "Building OpenBIOS on $(HOSTARCH) for $(TARGETS)" clean: @printf "Cleaning up..." - @rm -rf $(ODIR) forth.dict.core + @rm -rf $(ODIRS) forth.dict.core @find . -type f -name "*~" -exec rm \{\} \; @echo " ok" -directories: clean - @printf "Initializing build tree..." - @mkdir $(ODIR) - @mkdir -p $(ODIR)/target - @mkdir -p $(ODIR)/target/include - @mkdir -p $(ODIR)/target/arch - @mkdir -p $(ODIR)/target/arch/unix - @mkdir -p $(ODIR)/target/arch/$(ARCH) - @mkdir -p $(ODIR)/target/arch/ppc - @mkdir -p $(ODIR)/target/arch/ppc/briq # no autodetection of those.. - @mkdir -p $(ODIR)/target/arch/ppc/pearpc - @mkdir -p $(ODIR)/target/arch/ppc/qemu - @mkdir -p $(ODIR)/target/arch/ppc/mol - @mkdir -p $(ODIR)/target/arch/x86 - @mkdir -p $(ODIR)/target/arch/x86/xbox - @mkdir -p $(ODIR)/target/libgcc - @mkdir -p $(ODIR)/target/kernel - @mkdir -p $(ODIR)/target/modules - @mkdir -p $(ODIR)/target/fs - @mkdir -p $(ODIR)/target/fs/grubfs - @mkdir -p $(ODIR)/target/fs/hfs - @mkdir -p $(ODIR)/target/fs/hfsplus - @mkdir -p $(ODIR)/target/drivers - @mkdir -p $(ODIR)/target/libc - @mkdir -p $(ODIR)/host/include - @mkdir -p $(ODIR)/host/kernel - @mkdir -p $(ODIR)/forth - @ln -s $(PWD)/include/$(ARCH) $(ODIR)/target/include/asm - @#compile the host binary with target settings instead - @#ln -s $(PWD)/include/$(HOSTARCH) $(ODIR)/host/include/asm - @echo "ok." - -# This is needed because viewvc messes with the permissions of executables: -prepare: - @chmod 755 utils/dist/debian/rules - @chmod 755 config/scripts/switch-arch - @chmod 755 config/scripts/archname - @chmod 755 config/scripts/reldir - @chmod 755 config/scripts/crosscflags - -xml: directories - @printf "Creating target Makefile..." - @xsltproc config/xml/xinclude.xsl build.xml > $(ODIR)/build-full.xml - @xsltproc config/xml/makefile.xsl $(ODIR)/build-full.xml > $(ODIR)/Makefile - @echo "ok." - @printf "Creating config files..." - @xsltproc config/xml/config-c.xsl config.xml > $(ODIR)/host/include/autoconf.h - @xsltproc config/xml/config-c.xsl config.xml > $(ODIR)/target/include/autoconf.h - @xsltproc config/xml/config-forth.xsl config.xml > $(ODIR)/forth/config.fs - @echo "ok." - -build: xml +build: @printf "Building..." - @( $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)" > $(ODIR)/build.log 2>&1 && echo "ok." ) || \ - ( echo "error:"; tail -15 $(ODIR)/build.log ) + @for dir in $(ODIRS); do \ + $(MAKE) -C $$dir > $$dir/build.log 2>&1 && echo "ok." || \ + ( echo "error:"; tail -15 $$$dir/build.log; exit 1 ) \ + done build-verbose: @echo "Building..." - $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)" + @for dir in $(ODIRS); do \ + $(MAKE) -C $$dir || exit 1; \ + done -run: +run: @echo "Running..." @$(ODIR)/openbios-unix $(ODIR)/openbios-unix.dict Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/ppc/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -39,7 +39,7 @@ <executable name="target/arch/ppc/briq/kernel.o" target="target" condition="BRIQ"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/briq/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/briq/kernel.c ]]></rule> <external-object source="target/include/briq-dict.h"/> </executable> @@ -57,7 +57,7 @@ <executable name="target/arch/ppc/pearpc/kernel.o" target="target" condition="PEARPC"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/pearpc/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/pearpc/kernel.c ]]></rule> <external-object source="target/include/pearpc-dict.h"/> </executable> @@ -74,7 +74,7 @@ <executable name="target/arch/ppc/qemu/kernel.o" target="target" condition="QEMU"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/qemu/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/qemu/kernel.c ]]></rule> <external-object source="target/include/qemu-dict.h"/> </executable> @@ -92,7 +92,7 @@ <executable name="target/arch/ppc/mol/kernel.o" target="target" condition="MOL"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/mol/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/mol/kernel.c ]]></rule> <external-object source="target/include/mol-dict.h"/> </executable> @@ -105,13 +105,13 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> - <object source="briq/briq.c" flags="-Iarch/ppc"/> - <object source="briq/init.c" flags="-Iarch/ppc"/> + <object source="briq/briq.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/briq/kernel.o"/> - <object source="briq/main.c" flags="-Iarch/ppc"/> - <object source="briq/methods.c" flags="-Iarch/ppc"/> - <object source="briq/tree.c" flags="-Iarch/ppc"/> - <object source="briq/vfd.c" flags="-Iarch/ppc"/> + <object source="briq/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> <library name="pearpc" target="target" type="static" condition="PEARPC"> @@ -120,15 +120,15 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> - <object source="pearpc/pearpc.c" flags="-Iarch/ppc"/> - <object source="pearpc/init.c" flags="-Iarch/ppc"/> + <object source="pearpc/pearpc.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/pearpc/kernel.o"/> - <object source="pearpc/main.c" flags="-Iarch/ppc"/> - <object source="pearpc/methods.c" flags="-Iarch/ppc"/> - <object source="pearpc/tree.c" flags="-Iarch/ppc"/> - <object source="pearpc/vfd.c" flags="-Iarch/ppc"/> + <object source="pearpc/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/>  - <object source="pearpc/console.c" flags="-Iarch/ppc"/> + <object source="pearpc/console.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> <library name="qemu" target="target" type="static" condition="QEMU"> @@ -137,13 +137,13 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="qemu/ofmem.c"/> - <object source="qemu/qemu.c" flags="-Iarch/ppc"/> - <object source="qemu/init.c" flags="-Iarch/ppc"/> + <object source="qemu/qemu.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/qemu/kernel.o"/> - <object source="qemu/main.c" flags="-Iarch/ppc"/> - <object source="qemu/methods.c" flags="-Iarch/ppc"/> - <object source="qemu/vfd.c" flags="-Iarch/ppc"/> - <object source="qemu/console.c" flags="-Iarch/ppc"/> + <object source="qemu/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/console.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> @@ -153,16 +153,16 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> - <object source="mol/init.c" flags="-Iarch/ppc"/> - <object source="mol/main.c" flags="-Iarch/ppc"/> - <object source="mol/mol.c" flags="-Iarch/ppc"/> - <object source="mol/console.c" flags="-Iarch/ppc"/> - <object source="mol/osi-blk.c" flags="-Iarch/ppc"/> - <object source="mol/osi-scsi.c" flags="-Iarch/ppc"/> - <object source="mol/pseudodisk.c" flags="-Iarch/ppc"/> - <object source="mol/methods.c" flags="-Iarch/ppc"/> - <object source="mol/prom.c" flags="-Iarch/ppc"/> - <object source="mol/tree.c" flags="-Iarch/ppc"/> + <object source="mol/init.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/mol.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/console.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/osi-blk.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/osi-scsi.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/pseudodisk.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/prom.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/mol/kernel.o"/> </library> @@ -215,7 +215,7 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(LD) --warn-common -N -T arch/ppc/qemu/ldscript $^ -o $@ + $(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript $^ -o $@ $(NM) $@ | sort > $(ODIR)/openbios-qemu.syms cp $@ $@.nostrip $(STRIP) $@ Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/sparc32/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -23,17 +23,17 @@ </library> <executable name="target/arch/sparc32/entry.o" target="target"> - <rule><![CDATA[ arch/sparc32/entry.S + <rule><![CDATA[ $(SRCDIR)/arch/sparc32/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="target/arch/sparc32/vectors.o" target="target"> - <rule><![CDATA[ arch/sparc32/vectors.S arch/sparc32/wof.S arch/sparc32/wuf.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/vectors.S]]></rule> + <rule><![CDATA[ $(SRCDIR)/arch/sparc32/vectors.S $(SRCDIR)/arch/sparc32/wof.S $(SRCDIR)/arch/sparc32/wuf.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/vectors.S]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -N -T arch/sparc32/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@</rule> @@ -61,15 +61,15 @@ </executable> <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ arch/sparc32/builtin.c $(ODIR)/target/include/static-dict.h - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c]]></rule> + <rule><![CDATA[ $(SRCDIR)/arch/sparc32/builtin.c $(ODIR)/target/include/static-dict.h + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/builtin.c]]></rule> </executable>  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) --warn-common -N -T arch/sparc32/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/sparc64/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -22,17 +22,17 @@ </library> <executable name="target/arch/sparc64/entry.o" target="target"> - <rule><![CDATA[ arch/sparc64/entry.S + <rule><![CDATA[ $(SRCDIR)/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[ arch/sparc64/vectors.S + <rule><![CDATA[ $(SRCDIR)/arch/sparc64/vectors.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) --warn-common -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@</rule> @@ -61,8 +61,8 @@ </executable> <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ arch/sparc64/builtin.c $(ODIR)/target/include/static-dict.h - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/builtin.c]]></rule> + <rule><![CDATA[ $(SRCDIR)/arch/sparc64/builtin.c $(ODIR)/target/include/static-dict.h + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc64/builtin.c]]></rule> </executable>  @@ -70,7 +70,7 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED">  <rule> - $(LD) --warn-common -N -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/arch/x86/build.xml =================================================================== --- openbios-devel/arch/x86/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/x86/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -22,13 +22,13 @@ </library> <executable name="target/arch/x86/entry.o" target="target"> - <rule><![CDATA[ arch/x86/entry.S + <rule><![CDATA[ $(SRCDIR)/arch/x86/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT"> <rule> - $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms cp $@.nostrip $@ $(STRIP) $@ @@ -47,7 +47,7 @@ <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@ @@ -78,7 +78,7 @@ <executable name="target/arch/x86/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/x86/builtin.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/x86/builtin.c ]]></rule> <external-object source="target/include/static-dict.h"/> </executable> @@ -87,7 +87,7 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/amd64_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := amd64 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AS := as @@ -26,7 +29,7 @@ CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include # # pre rules Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := ppc -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf # @@ -29,7 +32,7 @@ CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Werror CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include M4 := m4 Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := sparc32 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include TARGET=sparc-elf- CC := $(TARGET)gcc @@ -26,7 +29,7 @@ CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g # Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := sparc64 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include TARGET=sparc64-elf- CC := $(TARGET)gcc @@ -27,7 +30,7 @@ CFLAGS+= -fno-builtin -nostdlib -ffreestanding CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g # Modified: openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- openbios-devel/config/examples/cross-x86_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-x86_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := x86 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include #TARGET=i386-elf- TARGET= @@ -27,7 +30,7 @@ CFLAGS+= -m32 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-32 -g # Modified: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/ppc_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := ppc -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf # @@ -28,7 +31,7 @@ CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include M4 := m4 Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/sparc32_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := sparc32 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AS := as @@ -31,7 +34,7 @@ CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g # Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,13 +7,16 @@ # ARCH := sparc64 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AS := as @@ -32,7 +35,7 @@ CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g ifeq ($(shell uname), OpenBSD) Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/x86_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := x86 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AR := ar @@ -29,7 +32,7 @@ CFLAGS+= -m32 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-32 -g # Modified: openbios-devel/config/scripts/switch-arch =================================================================== --- openbios-devel/config/scripts/switch-arch 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/scripts/switch-arch 2009-01-23 20:09:26 UTC (rev 420) @@ -1,7 +1,7 @@ #!/bin/sh if [ x"$1" = x ]; then - printf "Usage:\n $0 [arch-config]\n" + printf "Usage:\n $0 [arch-config]...\n" printf "arch-config values supported for native builds:\n" printf " amd64, ppc, sparc32, sparc64, x86\n" printf "arch-config values supported for cross compiled builds:\n" @@ -9,9 +9,64 @@ exit 0 fi -ARCH=$1 +# This is needed because viewvc messes with the permissions of executables: +chmod 755 utils/dist/debian/rules +chmod 755 config/scripts/switch-arch +chmod 755 config/scripts/archname +chmod 755 config/scripts/reldir +chmod 755 config/scripts/crosscflags +HOSTARCH=`config/scripts/archname` -rm -f rules.xml -rm -f config.xml -ln -s config/examples/${ARCH}_rules.xml rules.xml -ln -s config/examples/${ARCH}_config.xml config.xml +echo "Configuring OpenBIOS on $HOSTARCH for $*" +for RULES_ARCH in $*; do + ARCH=`cat config/examples/${RULES_ARCH}_rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ ` + OBJDIR=obj-$ARCH + printf "Initializing build tree $OBJDIR..." + rm -rf "$OBJDIR" + mkdir "$OBJDIR" + mkdir -p $OBJDIR/target + mkdir -p $OBJDIR/target/include + mkdir -p $OBJDIR/target/arch + mkdir -p $OBJDIR/target/arch/unix + mkdir -p $OBJDIR/target/arch/$ARCH + mkdir -p $OBJDIR/target/arch/ppc + mkdir -p $OBJDIR/target/arch/ppc/briq # no autodetection of those.. + mkdir -p $OBJDIR/target/arch/ppc/pearpc + mkdir -p $OBJDIR/target/arch/ppc/qemu + mkdir -p $OBJDIR/target/arch/ppc/mol + mkdir -p $OBJDIR/target/arch/x86 + mkdir -p $OBJDIR/target/arch/x86/xbox + mkdir -p $OBJDIR/target/libgcc + mkdir -p $OBJDIR/target/kernel + mkdir -p $OBJDIR/target/modules + mkdir -p $OBJDIR/target/fs + mkdir -p $OBJDIR/target/fs/grubfs + mkdir -p $OBJDIR/target/fs/hfs + mkdir -p $OBJDIR/target/fs/hfsplus + mkdir -p $OBJDIR/target/drivers + mkdir -p $OBJDIR/target/libc + mkdir -p $OBJDIR/host/include + mkdir -p $OBJDIR/host/kernel + mkdir -p $OBJDIR/forth + ln -s ../../../include/$ARCH $OBJDIR/target/include/asm + #compile the host binary with target settings instead + #ln -s ../../../include/$HOSTARCH $OBJDIR/host/include/asm + echo "ok." + + cd $OBJDIR + SRCDIR=.. + ODIR=. + + printf "Creating target Makefile..." + ln -s $SRCDIR/config/examples/${RULES_ARCH}_rules.xml $ODIR/rules.xml + ln -s $SRCDIR/config/examples/${RULES_ARCH}_config.xml $ODIR/config.xml + xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml + xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/Makefile + echo "ok." + printf "Creating config files..." + xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/host/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/target/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-forth.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/forth/config.fs + echo "ok." + cd $SRCDIR +done Modified: openbios-devel/config/xml/dictionary.xsl =================================================================== --- openbios-devel/config/xml/dictionary.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/dictionary.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -56,6 +56,7 @@ <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> + <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> <xsl:text>
</xsl:text> @@ -116,6 +117,7 @@ <xsl:if test="$conditions = 0"> <xsl:text> -I</xsl:text> + <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> </xsl:if> </xsl:for-each> Modified: openbios-devel/config/xml/makefile.xsl =================================================================== --- openbios-devel/config/xml/makefile.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/makefile.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -7,7 +7,7 @@ <xsl:include href="object.xsl"/> <xsl:template match="/"> - <xsl:value-of select="document('../../rules.xml')/rules/pre"/> + <xsl:value-of select="document('rules.xml',.)/rules/pre"/> <xsl:apply-templates select="." mode="dictionaries"/> <xsl:apply-templates select="." mode="objects"/> </xsl:template> Modified: openbios-devel/config/xml/object.xsl =================================================================== --- openbios-devel/config/xml/object.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/object.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -52,6 +52,7 @@ <xsl:text>.o: </xsl:text>  + <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> @@ -68,7 +69,7 @@ <xsl:text>" ;\</xsl:text> </xsl:if>  - <xsl:value-of select="document('../../rules.xml')//rule[@target=$target][@entity='object']"/> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='object']"/> </xsl:otherwise> </xsl:choose> @@ -154,7 +155,7 @@ </xsl:when> <xsl:otherwise>  - <xsl:value-of select="document('../../rules.xml')//rule[@target=$target][@entity='executable']"/> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='executable']"/> </xsl:otherwise> </xsl:choose> @@ -252,7 +253,7 @@  - <xsl:value-of select="document('../../rules.xml')//rule[@target=$target][@entity='library']"/> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='library']"/> </xsl:if> </xsl:if> Modified: openbios-devel/config/xml/util.xsl =================================================================== --- openbios-devel/config/xml/util.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/util.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -44,8 +44,8 @@ <xsl:choose> <xsl:when test="$expression!=''"> - <xsl:variable name="value"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::value"/></xsl:variable> - <xsl:variable name="type"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::type"/></xsl:variable> + <xsl:variable name="value"><xsl:value-of select="document('config.xml',.)//option[@name=$confexpr]/attribute::value"/></xsl:variable> + <xsl:variable name="type"><xsl:value-of select="document('config.xml',.)//option[@name=$confexpr]/attribute::type"/></xsl:variable> <xsl:choose> <xsl:when test="$type='boolean'"> <xsl:choose> Modified: openbios-devel/fs/hfs/build.xml =================================================================== --- openbios-devel/fs/hfs/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/fs/hfs/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -1,15 +1,15 @@ <build> <library name="fs" type="static" target="target"> - <object source="block.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="btree.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="data.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="file.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="hfs.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="low.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="medium.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="node.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="record.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="volume.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="hfs_fs.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> + <object source="block.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="btree.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="data.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="file.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="hfs.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="low.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="medium.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="node.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="record.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="volume.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="hfs_fs.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> </library> </build> Modified: openbios-devel/fs/hfsplus/build.xml =================================================================== --- openbios-devel/fs/hfsplus/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/fs/hfsplus/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -1,11 +1,11 @@ <build> <library name="fs" type="static" target="target"> - <object source="blockiter.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="btree.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="libhfsp.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="record.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="unicode.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="volume.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="hfsp_fs.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="libhfsp.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_fs.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> </library> </build>

1 0

sparc32 solaris 2.5.1 boot problem
by Robert Reif 23 Jan '09

23 Jan '09

I'm trying to boot solaris 2.5.1 and it appears based on the addresses it's accessing that mbus systems think they are a single processor system. Commenting out ob_sconfig_init gets further so this should depend on the machine type. Only single processor systems should have a slavioconfig entry.

2 3

Jump to page: