October 2010 - OpenBIOS - mail.coreboot.org

[commit] r937 - trunk/openbios-devel/arch/ppc/qemu
by repository service Oct. 31, 2010

Oct. 31, 2010

Author: afaerber Date: Sun Oct 31 11:30:22 2010 New Revision: 937 URL: http://tracker.coreboot.org/trac/openbios/changeset/937 Log: ppc: Add RTAS rtas-version property The CHRP 1.0 spec defines it as 1, which matches the IBM JS20. Macs appear to have it as 0x41 though. v2: * Authentically set it to 0x41 for Apple machines. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 11:21:50 2010 (r936) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 11:30:22 2010 (r937) @@ -764,6 +764,7 @@ while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) size *= 2; set_property(ph, "rtas-size", (char*)&size, sizeof(size)); + set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); } break; }

1 0

[commit] r936 - trunk/openbios-devel/arch/ppc/qemu
by repository service Oct. 31, 2010

Oct. 31, 2010

Author: afaerber Date: Sun Oct 31 11:21:50 2010 New Revision: 936 URL: http://tracker.coreboot.org/trac/openbios/changeset/936 Log: ppc: Don't set up RTAS for OldWorld Macs According to historical device trees, pre-iMac Macs do not seem to have the /rtas node. Make /rtas conditional to NewWorld Macs for now, while allowing to extend this to future CHRP machines. This means that the ppc-softmmu would by default not have it, except when using -M mac99. ppc64-softmmu would get it by default. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 10:59:12 2010 (r935) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 11:21:50 2010 (r936) @@ -753,13 +753,19 @@ node_methods_init(buf); #ifdef CONFIG_RTAS - if( !(ph=find_dev("/rtas")) ) - printk("Warning: No /rtas node\n"); - else { - unsigned long size = 0x1000; - while( size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start ) - size *= 2; - set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); + /* OldWorld Macs don't have an /rtas node. */ + switch (machine_id) { + case ARCH_MAC99: + case ARCH_MAC99_U3: + if (!(ph = find_dev("/rtas"))) { + printk("Warning: No /rtas node\n"); + } else { + unsigned long size = 0x1000; + while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) + size *= 2; + set_property(ph, "rtas-size", (char*)&size, sizeof(size)); + } + break; } #endif Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Oct 31 10:59:12 2010 (r935) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Oct 31 11:21:50 2010 (r936) @@ -304,7 +304,9 @@ { phandle_t chosen, ph; #ifdef CONFIG_RTAS - REGISTER_NODE( rtas ); + if (is_newworld()) { + REGISTER_NODE( rtas ); + } #endif REGISTER_NODE( ciface ); REGISTER_NODE( memory );

1 0

[commit] r934 - trunk/openbios-devel/arch/ppc/qemu
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sun Oct 31 00:49:20 2010 New Revision: 934 URL: http://tracker.coreboot.org/trac/openbios/changeset/934 Log: ppc: Add support for -cpu 970 The 970fx is supported, which happens to be the default CPU for -M mac99. The IBM JS20 had a dual 970 though, and -cpu 970 leads to a busy loop: >> Unknown cpu (pvr 390000), freezing! Add a definition for the 970. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 30 18:26:02 2010 (r933) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 00:49:20 2010 (r934) @@ -472,6 +472,18 @@ .clock_frequency = 0x1dcd6500, .initfn = cpu_g4_init, }, + { + .iu_version = 0x00390000, + .name = "PowerPC,970", + .icache_size = 0x10000, + .dcache_size = 0x8000, + .icache_sets = 0x200, + .dcache_sets = 0x80, + .icache_block_size = 0x80, + .dcache_block_size = 0x80, + .clock_frequency = 0x5f5e1000, + .initfn = cpu_970_init, + }, { // XXX find out real values .iu_version = 0x003C0000, .name = "PowerPC,970FX",

1 0

[commit] r933 - in trunk/openbios-devel: drivers include/arch/ppc include/drivers
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sat Oct 30 18:26:02 2010 New Revision: 933 URL: http://tracker.coreboot.org/trac/openbios/changeset/933 Log: Don't make assumptions about device address size Prefer phys_addr_t for physical addresses. Resort to uintptr_t where a conversion to pointer occurs, since the physical address may be larger (e.g., sparc32). v2: * Use phys_addr_t. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/cuda.h trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/escc.h trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/macio.h trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/cuda.c Sat Oct 30 18:26:02 2010 (r933) @@ -369,7 +369,7 @@ } -cuda_t *cuda_init (const char *path, uint32_t base) +cuda_t *cuda_init (const char *path, phys_addr_t base) { cuda_t *cuda; char buf[64]; Modified: trunk/openbios-devel/drivers/cuda.h ============================================================================== --- trunk/openbios-devel/drivers/cuda.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/cuda.h Sat Oct 30 18:26:02 2010 (r933) @@ -1,7 +1,7 @@ #include "adb_bus.h" struct cuda_t { - uint32_t base; + phys_addr_t base; adb_bus_t *adb_bus; }; typedef struct cuda_t cuda_t; @@ -14,4 +14,4 @@ CHARDEV_LAST, }; -cuda_t *cuda_init (const char *path, uint32_t base); +cuda_t *cuda_init (const char *path, phys_addr_t base); Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/escc.c Sat Oct 30 18:26:02 2010 (r933) @@ -13,11 +13,11 @@ static volatile unsigned char *serial_dev; -#define CTRL(addr) (*(volatile unsigned char *)(addr)) +#define CTRL(addr) (*(volatile unsigned char *)(uintptr_t)(addr)) #ifdef CONFIG_DRIVER_ESCC_SUN -#define DATA(addr) (*(volatile unsigned char *)(addr + 2)) +#define DATA(addr) (*(volatile unsigned char *)(uintptr_t)(addr + 2)) #else -#define DATA(addr) (*(volatile unsigned char *)(addr + 16)) +#define DATA(addr) (*(volatile unsigned char *)(uintptr_t)(addr + 16)) #endif /* Conversion routines to/from brg time constants from/to bits @@ -54,19 +54,19 @@ #define Rx_CH_AV 0x1 /* Rx Character Available */ #define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ -int uart_charav(int port) +int uart_charav(uintptr_t port) { return (CTRL(port) & Rx_CH_AV) != 0; } -char uart_getchar(int port) +char uart_getchar(uintptr_t port) { while (!uart_charav(port)) ; return DATA(port) & 0177; } -static void uart_putchar(int port, unsigned char c) +static void uart_putchar(uintptr_t port, unsigned char c) { if (!serial_dev) return; @@ -102,13 +102,13 @@ } -int uart_init(uint64_t port, unsigned long speed) +int uart_init(phys_addr_t port, unsigned long speed) { #ifdef CONFIG_DRIVER_ESCC_SUN serial_dev = map_io(port & ~7ULL, ZS_REGS); serial_dev += port & 7ULL; #else - serial_dev = (unsigned char *)(unsigned long)port; + serial_dev = (unsigned char *)(uintptr_t)port; #endif uart_init_line(serial_dev, speed); return -1; @@ -116,7 +116,7 @@ void serial_putchar(int c) { - uart_putchar((int)serial_dev, (unsigned char) (c & 0xff)); + uart_putchar((uintptr_t)serial_dev, (unsigned char) (c & 0xff)); } void serial_cls(void) @@ -131,7 +131,7 @@ /* ( addr len -- actual ) */ static void -escc_read(unsigned long *address) +escc_read(phys_addr_t *address) { char *addr; int len; @@ -140,7 +140,7 @@ addr = (char *)cell2pointer(POP()); if (len < 1) - printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); + printk("escc_read: bad len, addr %p len %x\n", addr, len); if (uart_charav(*address)) { *addr = (char)uart_getchar(*address); @@ -152,7 +152,7 @@ /* ( addr len -- actual ) */ static void -escc_write(unsigned long *address) +escc_write(phys_addr_t *address) { unsigned char *addr; int i, len; @@ -172,7 +172,7 @@ } static void -escc_open(unsigned long *address) +escc_open(phys_addr_t *address) { #ifdef CONFIG_DRIVER_ESCC_SUN int len; @@ -199,7 +199,7 @@ RET ( -1 ); } -DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(unsigned long)); +DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(phys_addr_t)); NODE_METHODS(escc) = { { "open", escc_open }, @@ -211,7 +211,7 @@ #ifdef CONFIG_DRIVER_ESCC_SUN static volatile unsigned char *kbd_dev; -void kbd_init(uint64_t base) +void kbd_init(phys_addr_t base) { kbd_dev = map_io(base, 2 * 4); kbd_dev += 4; @@ -295,7 +295,7 @@ addr = (unsigned char *)POP(); if (len < 1) - printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); + printk("escc_read: bad len, addr %p len %x\n", addr, len); if (keyboard_dataready()) { *addr = keyboard_readdata(); @@ -305,7 +305,7 @@ } } -DECLARE_UNNAMED_NODE(escc_keyboard, INSTALL_OPEN, sizeof(unsigned long)); +DECLARE_UNNAMED_NODE(escc_keyboard, INSTALL_OPEN, sizeof(phys_addr_t)); NODE_METHODS(escc_keyboard) = { { "open", escc_open }, @@ -314,7 +314,7 @@ }; void -ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, int keyboard) +ob_zs_init(phys_addr_t base, uint64_t offset, int intr, int slave, int keyboard) { char nodebuff[256]; phandle_t aliases; @@ -369,7 +369,7 @@ #else static void -escc_add_channel(const char *path, const char *node, uint32_t addr, +escc_add_channel(const char *path, const char *node, phys_addr_t addr, uint32_t offset) { char buf[64], tty[32]; @@ -430,7 +430,7 @@ } void -escc_init(const char *path, unsigned long addr) +escc_init(const char *path, phys_addr_t addr) { char buf[64]; int props[2]; Modified: trunk/openbios-devel/drivers/escc.h ============================================================================== --- trunk/openbios-devel/drivers/escc.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/escc.h Sat Oct 30 18:26:02 2010 (r933) @@ -4,6 +4,6 @@ #define ZS_REGS 8 -void escc_init(const char *path, unsigned long addr); -void ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, +void escc_init(const char *path, phys_addr_t addr); +void ob_zs_init(phys_addr_t base, uint64_t offset, int intr, int slave, int keyboard); Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/macio.c Sat Oct 30 18:26:02 2010 (r933) @@ -43,7 +43,7 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } -void macio_nvram_init(const char *path, uint32_t addr) +void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; phandle_t dnode; @@ -145,7 +145,7 @@ } static void -openpic_init(const char *path, uint32_t addr) +openpic_init(const char *path, phys_addr_t addr) { phandle_t target_node; phandle_t dnode; @@ -238,7 +238,7 @@ }; void -ob_macio_heathrow_init(const char *path, uint32_t addr) +ob_macio_heathrow_init(const char *path, phys_addr_t addr) { phandle_t aliases; @@ -253,7 +253,7 @@ } void -ob_macio_keylargo_init(const char *path, uint32_t addr) +ob_macio_keylargo_init(const char *path, phys_addr_t addr) { phandle_t aliases; Modified: trunk/openbios-devel/drivers/macio.h ============================================================================== --- trunk/openbios-devel/drivers/macio.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/macio.h Sat Oct 30 18:26:02 2010 (r933) @@ -1,5 +1,5 @@ extern phandle_t pic_handle; -void ob_macio_heathrow_init(const char *path, uint32_t addr); -void ob_macio_keylargo_init(const char *path, uint32_t addr); -void macio_nvram_init(const char *path, uint32_t addr); +void ob_macio_heathrow_init(const char *path, phys_addr_t addr); +void ob_macio_keylargo_init(const char *path, phys_addr_t addr); +void macio_nvram_init(const char *path, phys_addr_t addr); Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/include/arch/ppc/io.h Sat Oct 30 18:26:02 2010 (r933) @@ -22,15 +22,15 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insw(port, buf, ns) _insw((uint16_t *)((port)+isa_io_base), (buf), (ns)) -#define outsw(port, buf, ns) _outsw((uint16_t *)((port)+isa_io_base), (buf), (ns)) +#define insw(port, buf, ns) _insw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) +#define outsw(port, buf, ns) _outsw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) -#define inb(port) in_8((uint8_t *)((port)+isa_io_base)) -#define outb(val, port) out_8((uint8_t *)((port)+isa_io_base), (val)) -#define inw(port) in_le16((uint16_t *)((port)+isa_io_base)) -#define outw(val, port) out_le16((uint16_t *)((port)+isa_io_base), (val)) -#define inl(port) in_le32((uint32_t *)((port)+isa_io_base)) -#define outl(val, port) out_le32((uint32_t *)((port)+isa_io_base), (val)) +#define inb(port) in_8((uint8_t *)(uintptr_t)((port)+isa_io_base)) +#define outb(val, port) out_8((uint8_t *)(uintptr_t)((port)+isa_io_base), (val)) +#define inw(port) in_le16((uint16_t *)(uintptr_t)((port)+isa_io_base)) +#define outw(val, port) out_le16((uint16_t *)(uintptr_t)((port)+isa_io_base), (val)) +#define inl(port) in_le32((uint32_t *)(uintptr_t)((port)+isa_io_base)) +#define outl(val, port) out_le32((uint32_t *)(uintptr_t)((port)+isa_io_base), (val)) /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/include/drivers/drivers.h Sat Oct 30 18:26:02 2010 (r933) @@ -113,9 +113,9 @@ void serial_putchar(int c); #endif #ifdef CONFIG_DRIVER_ESCC -int uart_init(uint64_t port, unsigned long speed); -int uart_charav(int port); -char uart_getchar(int port); +int uart_init(phys_addr_t port, unsigned long speed); +int uart_charav(uintptr_t port); +char uart_getchar(uintptr_t port); void serial_putchar(int c); void serial_cls(void); #ifdef CONFIG_DRIVER_ESCC_SUN

1 0

[commit] r932 - in trunk/openbios-devel/include/arch: amd64 ia64 ppc sparc32 sparc64 x86
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sat Oct 30 18:18:08 2010 New Revision: 932 URL: http://tracker.coreboot.org/trac/openbios/changeset/932 Log: Introduce physical address type Define phys_addr_t type for all architectures. v2: * Add comment on PAE for x86, pointed out by Blue. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/ia64/types.h trunk/openbios-devel/include/arch/ppc/types.h trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h trunk/openbios-devel/include/arch/x86/types.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/amd64/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -16,6 +16,9 @@ /* endianess */ #include "autoconf.h" +/* physical address */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef long long cell; Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/ia64/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -17,6 +17,9 @@ #include <endian.h> +/* physical address */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef int64_t cell; Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/ppc/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -30,6 +30,13 @@ /* endianess */ #include "autoconf.h" +/* physical address */ +#if defined(__powerpc64__) +typedef uint64_t phys_addr_t; +#else +typedef uint32_t phys_addr_t; +#endif + /* cell based types */ typedef int32_t cell; Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -30,6 +30,9 @@ /* endianess */ #include "autoconf.h" +/* physical address: 36 bits */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef int32_t cell; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -30,6 +30,9 @@ /* endianess */ #include "autoconf.h" +/* physical address */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef long long cell; typedef unsigned long long ucell; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/x86/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -17,6 +17,9 @@ #include "autoconf.h" +/* physical address: XXX theoretically 36 bits for PAE */ +typedef uint32_t phys_addr_t; + /* cell based types */ typedef int32_t cell;

1 0

[commit] r931 - trunk/openbios-devel/include/kernel
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sat Oct 30 18:15:17 2010 New Revision: 931 URL: http://tracker.coreboot.org/trac/openbios/changeset/931 Log: ppc64: Quickfix for pointer2cell() and cell2pointer() Add a uintptr_t cast as an interim solution to resolve errors for ppc64, where pointer size is larger than cell size. v2: * Add comment on potential better fix. Postpone potential conversion to inline function until investigated. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/kernel/stack.h Modified: trunk/openbios-devel/include/kernel/stack.h ============================================================================== --- trunk/openbios-devel/include/kernel/stack.h Sat Oct 30 17:44:08 2010 (r930) +++ trunk/openbios-devel/include/kernel/stack.h Sat Oct 30 18:15:17 2010 (r931) @@ -31,8 +31,9 @@ #ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -#define pointer2cell(x) ((ucell)(x)) -#define cell2pointer(x) ((u8 *)(x)) +// XXX Check whether we can take the larger-than code path for ppc64 instead. +#define pointer2cell(x) ((ucell)(uintptr_t)(x)) +#define cell2pointer(x) ((u8 *)(uintptr_t)(x)) #endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH #define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address))

1 0

[commit] r930 - trunk/openbios-devel/kernel
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sat Oct 30 17:44:08 2010 New Revision: 930 URL: http://tracker.coreboot.org/trac/openbios/changeset/930 Log: Don't assume that pointer and cell size are identical, part 2 Do the double-dereference in two cell2pointer steps to avoid garbage in the high 32 address bits on ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Sat Oct 30 17:33:11 2010 (r929) +++ trunk/openbios-devel/kernel/internal.c Sat Oct 30 17:44:08 2010 (r930) @@ -329,10 +329,11 @@ #ifndef FCOMPILER static ucell get_myself(void) { - static ucell **myself = NULL; - if( !myself ) - myself = (ucell**)findword("my-self") + 1; - return (*myself && **myself) ? (ucell)**myself : 0; + static ucell *myselfptr = NULL; + if (myselfptr == NULL) + myselfptr = (ucell*)cell2pointer(findword("my-self")) + 1; + ucell *myself = (ucell*)cell2pointer(*myselfptr); + return (myself != NULL) ? *myself : 0; } static void doivar(void)

1 0

[PATCH] switch-arch: Fix recognition of x86_64 target as 64-bit
by Andreas Färber Oct. 30, 2010

Oct. 30, 2010

The comparison would've always been false due to missing $. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- config/scripts/switch-arch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 8b6563d..60782e9 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -48,7 +48,7 @@ crosscflags() # target long bits test if test "$target" = "sparc64" -o "$target" = "ia64" \ - -o "$target" = "amd64" -o "target" = "x86_64" \ + -o "$target" = "amd64" -o "$target" = "x86_64" \ -o "$target" = "alpha"; then targetlongbits="64" else -- 1.7.3

3 8

[commit] r929 - in trunk/openbios-devel/arch: ppc ppc64 ppc64/qemu
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sat Oct 30 17:33:11 2010 New Revision: 929 URL: http://tracker.coreboot.org/trac/openbios/changeset/929 Log: ppc: Don't hardcode "ppc" arch for openbios-qemu.elf Use $(ARCH) to allow using a different linker script for ppc64. v2: * Add ppc64/qemu/ldscript, derived from ppc/qemu/ldscript. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Added: trunk/openbios-devel/arch/ppc64/ trunk/openbios-devel/arch/ppc64/qemu/ trunk/openbios-devel/arch/ppc64/qemu/ldscript - copied, changed from r928, trunk/openbios-devel/arch/ppc/qemu/ldscript Modified: trunk/openbios-devel/arch/ppc/build.xml Modified: trunk/openbios-devel/arch/ppc/build.xml ============================================================================== --- trunk/openbios-devel/arch/ppc/build.xml Sat Oct 30 17:19:58 2010 (r928) +++ trunk/openbios-devel/arch/ppc/build.xml Sat Oct 30 17:33:11 2010 (r929) @@ -178,7 +178,7 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/$(ARCH)/qemu/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-qemu.syms," GEN $(TARGET_DIR)$@.syms") $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <object source="qemu/start.S"/> Copied and modified: trunk/openbios-devel/arch/ppc64/qemu/ldscript (from r928, trunk/openbios-devel/arch/ppc/qemu/ldscript) ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ldscript Sat Oct 30 17:19:58 2010 (r928, copy source) +++ trunk/openbios-devel/arch/ppc64/qemu/ldscript Sat Oct 30 17:33:11 2010 (r929) @@ -1,5 +1,5 @@ -OUTPUT_FORMAT(elf32-powerpc) -OUTPUT_ARCH(powerpc) +OUTPUT_FORMAT(elf64-powerpc) +OUTPUT_ARCH(powerpc:common64) /* Initial load address */

1 0

[commit] r928 - trunk/openbios-devel/config/scripts
by repository service Oct. 30, 2010

Oct. 30, 2010

Author: afaerber Date: Sat Oct 30 17:19:58 2010 New Revision: 928 URL: http://tracker.coreboot.org/trac/openbios/changeset/928 Log: switch-arch: Whitelist targets that need int128_t ppc64 doesn't use int128_t and thus fails to build when NEED_FAKE_INT128_T gets defined, due to its use in include/kernel/stack.h. Continue to use it for all other targets for which "$targetlongbits" = "64". Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 17:17:37 2010 (r927) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 17:19:58 2010 (r928) @@ -74,10 +74,14 @@ cflags="$cflags -DNATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH" fi - if test "$host" = "x86" -a "$targetlongbits" = "64"; then - cflags="$cflags -DNEED_FAKE_INT128_T" - elif test "$host" = "ppc" -a "$targetlongbits" = "64" -a `uname -s` = "Darwin"; then - cflags="$cflags -DNEED_FAKE_INT128_T" + if test "$target" = "sparc64" -o "$target" = "ia64" \ + -o "$target" = "amd64" -o "$target" = "x86_64" \ + -o "$target" = "alpha"; then + if test "$host" = "x86"; then + cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then + cflags="$cflags -DNEED_FAKE_INT128_T" + fi fi CROSSCFLAGS=$cflags

1 0