coreboot April 2010

coreboot@coreboot.org

64 participants
402 discussions

build service results for r5386
by coreboot information 09 Apr '10

09 Apr '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 5386 to the coreboot repository. This caused the following changes: Change Log: thin out romcc epilogue and have it call copy_and_run as all the others do. Make sure copy_and_run is called with the right calling convention. Fix up 2 license headers. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Build Log: Compilation of a-trend:atc-6220 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=atc-6220&vendo… Compilation of a-trend:atc-6240 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=atc-6240&vendo… Compilation of abit:be6-ii_v2_0 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=be6-ii_v2_0&ve… Compilation of advantech:pcm-5820 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=pcm-5820&vendo… Compilation of amd:rumba has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=rumba&vendor=a… Compilation of asi:mb_5blgp has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=mb_5blgp&vendo… Compilation of asi:mb_5blmp has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=mb_5blmp&vendo… Compilation of asus:mew-am has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=mew-am&vendor=… Compilation of asus:mew-vm has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=mew-vm&vendor=… Compilation of asus:p2b has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=p2b&vendor=asu… Compilation of asus:p2b-d has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=p2b-d&vendor=a… Compilation of asus:p2b-ds has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=p2b-ds&vendor=… Compilation of asus:p2b-f has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=p2b-f&vendor=a… Compilation of asus:p2b-ls has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=p2b-ls&vendor=… Compilation of asus:p3b-f has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=p3b-f&vendor=a… Compilation of axus:tc320 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=tc320&vendor=a… Compilation of azza:pt-6ibd has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=pt-6ibd&vendor… Compilation of bcom:winnet100 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=winnet100&vend… Compilation of biostar:m6tba has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=m6tba&vendor=b… Compilation of compaq:deskpro_en_sff_p600 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=deskpro_en_sff… Compilation of dell:s1850 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=s1850&vendor=d… Compilation of digitallogic:adl855pc has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=adl855pc&vendo… Compilation of digitallogic:msm586seg has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=msm586seg&vend… Compilation of eaglelion:5bcm has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=5bcm&vendor=ea… Compilation of emulation:qemu-x86 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=qemu-x86&vendo… Compilation of gigabyte:ga-6bxc has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ga-6bxc&vendor… Compilation of hp:e_vectra_p2706t has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=e_vectra_p2706… Compilation of iei:juki-511p has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=juki-511p&vend… Compilation of iei:nova4899r has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=nova4899r&vend… Compilation of intel:jarrell has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=jarrell&vendor… Compilation of intel:mtarvon has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=mtarvon&vendor… Compilation of intel:truxton has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=truxton&vendor… Compilation of intel:xe7501devkit has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=xe7501devkit&v… Compilation of lippert:frontrunner has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=frontrunner&ve… Compilation of mitac:6513wu has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=6513wu&vendor=… Compilation of msi:ms6119 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ms6119&vendor=… Compilation of msi:ms6147 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ms6147&vendor=… Compilation of msi:ms6156 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ms6156&vendor=… Compilation of msi:ms6178 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ms6178&vendor=… Compilation of nec:powermate2000 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=powermate2000&… Compilation of olpc:btest has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=btest&vendor=o… Compilation of olpc:rev_a has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=rev_a&vendor=o… Compilation of rca:rm4100 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=rm4100&vendor=… Compilation of soyo:sy-6ba-plus-iii has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=sy-6ba-plus-ii… Compilation of supermicro:x6dai_g has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=x6dai_g&vendor… Compilation of supermicro:x6dhe_g has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=x6dhe_g&vendor… Compilation of supermicro:x6dhe_g2 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=x6dhe_g2&vendo… Compilation of supermicro:x6dhr_ig has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=x6dhr_ig&vendo… Compilation of supermicro:x6dhr_ig2 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=x6dhr_ig2&vend… Compilation of technologic:ts5300 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ts5300&vendor=… Compilation of televideo:tc7020 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=tc7020&vendor=… Compilation of thomson:ip1000 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=ip1000&vendor=… Compilation of tyan:s1846 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=s1846&vendor=t… Compilation of via:epia has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=epia&vendor=vi… Compilation of via:epia-cn has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=epia-cn&vendor… Compilation of via:epia-m has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=epia-m&vendor=… Compilation of via:epia-n has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=epia-n&vendor=… Compilation of via:pc2500e has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5386&device=pc2500e&vendor… If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5386 - in trunk/src: arch/i386/include/arch arch/i386/init cpu/amd/car cpu/x86/car
by repository service 09 Apr '10

09 Apr '10

Author: stepan Date: Fri Apr 9 12:12:18 2010 New Revision: 5386 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5386 Log: thin out romcc epilogue and have it call copy_and_run as all the others do. Make sure copy_and_run is called with the right calling convention. Fix up 2 license headers. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/arch/i386/include/arch/acpi.h trunk/src/arch/i386/init/crt0_prologue.inc trunk/src/arch/i386/init/crt0_romcc_epilogue.inc trunk/src/cpu/amd/car/copy_and_run.c trunk/src/cpu/x86/car/copy_and_run.c Modified: trunk/src/arch/i386/include/arch/acpi.h ============================================================================== --- trunk/src/arch/i386/include/arch/acpi.h Fri Apr 9 06:01:55 2010 (r5385) +++ trunk/src/arch/i386/include/arch/acpi.h Fri Apr 9 12:12:18 2010 (r5386) @@ -407,7 +407,6 @@ void suspend_resume(void); void *acpi_find_wakeup_vector(void); void *acpi_get_wakeup_rsdp(void); -void acpi_jmp_to_realm_wakeup(u32 linear_addr) __attribute__((regparm(0))); void acpi_jump_to_wakeup(void *wakeup_addr); int acpi_get_sleep_type(void); Modified: trunk/src/arch/i386/init/crt0_prologue.inc ============================================================================== --- trunk/src/arch/i386/init/crt0_prologue.inc Fri Apr 9 06:01:55 2010 (r5385) +++ trunk/src/arch/i386/init/crt0_prologue.inc Fri Apr 9 12:12:18 2010 (r5386) @@ -3,8 +3,7 @@ * * This file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. + * published by the Free Software Foundation; version 2 of the License. */ Modified: trunk/src/arch/i386/init/crt0_romcc_epilogue.inc ============================================================================== --- trunk/src/arch/i386/init/crt0_romcc_epilogue.inc Fri Apr 9 06:01:55 2010 (r5385) +++ trunk/src/arch/i386/init/crt0_romcc_epilogue.inc Fri Apr 9 12:12:18 2010 (r5386) @@ -1,124 +1,27 @@ -/* -*- asm -*- - * $ $ - * - */ - /* - * Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer + * Copyright 2002 Eric Biederman * * This file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * Originally this code was part of ucl the data compression library - * for upx the ``Ultimate Packer of eXecutables''. - * - * - Converted to gas assembly, and refitted to work with etherboot. - * Eric Biederman 20 Aug 2002 - * - Merged the nrv2b decompressor into crt0.base of coreboot - * Eric Biederman 26 Sept 2002 + * published by the Free Software Foundation; version 2 of the License. */ - -#ifndef CONSOLE_DEBUG_TX_STRING - /* uses: esp, ebx, ax, dx */ -# define __CRT_CONSOLE_TX_STRING(string) \ - mov string, %ebx ; \ - CALLSP(crt_console_tx_string) - -# if defined(CONFIG_TTYS0_BASE) && (ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG) -# define CONSOLE_DEBUG_TX_STRING(string) __CRT_CONSOLE_TX_STRING(string) -# else -# define CONSOLE_DEBUG_TX_STRING(string) -# endif -#endif - /* clear boot_complete flag */ xorl %ebp, %ebp __main: - CONSOLE_DEBUG_TX_STRING($str_copying_to_ram) - - /* - * Copy data into RAM and clear the BSS. Since these segments - * isn\'t really that big we just copy/clear using bytes, not - * double words. - */ - post_code(0x11) /* post 11 */ - - cld /* clear direction flag */ + post_code(0x11) + cld /* clear direction flag */ - /* copy coreboot from it's initial load location to - * the location it is compiled to run at. - * Normally this is copying from FLASH ROM to RAM. - */ movl %ebp, %esi + /* FIXME: look for a proper place for the stack */ movl $0x4000000, %esp movl %esp, %ebp pushl %esi - pushl $str_coreboot_ram_name - call cbfs_and_run_core + call copy_and_run .Lhlt: - post_code(0xee) /* post fe */ + post_code(0xee) hlt jmp .Lhlt -#ifdef __CRT_CONSOLE_TX_STRING - /* Uses esp, ebx, ax, dx */ -crt_console_tx_string: - mov (%ebx), %al - inc %ebx - cmp $0, %al - jne 9f - RETSP -9: -/* Base Address */ -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3f8 -#endif -/* Data */ -#define TTYS0_RBR (CONFIG_TTYS0_BASE+0x00) - -/* Control */ -#define TTYS0_TBR TTYS0_RBR -#define TTYS0_IER (CONFIG_TTYS0_BASE+0x01) -#define TTYS0_IIR (CONFIG_TTYS0_BASE+0x02) -#define TTYS0_FCR TTYS0_IIR -#define TTYS0_LCR (CONFIG_TTYS0_BASE+0x03) -#define TTYS0_MCR (CONFIG_TTYS0_BASE+0x04) -#define TTYS0_DLL TTYS0_RBR -#define TTYS0_DLM TTYS0_IER - -/* Status */ -#define TTYS0_LSR (CONFIG_TTYS0_BASE+0x05) -#define TTYS0_MSR (CONFIG_TTYS0_BASE+0x06) -#define TTYS0_SCR (CONFIG_TTYS0_BASE+0x07) - - mov %al, %ah -10: mov $TTYS0_LSR, %dx - inb %dx, %al - test $0x20, %al - je 10b - mov $TTYS0_TBR, %dx - mov %ah, %al - outb %al, %dx - - jmp crt_console_tx_string -#endif /* __CRT_CONSOLE_TX_STRING */ - -#if defined(CONSOLE_DEBUG_TX_STRING) && (ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG) -.section ".rom.data" -#if CONFIG_COMPRESS -str_copying_to_ram: .string "Uncompressing coreboot to RAM.\r\n" -#else -str_copying_to_ram: .string "Copying coreboot to RAM.\r\n" -#endif -str_pre_main: .string "Jumping to coreboot.\r\n" -.previous - -#endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */ - -str_coreboot_ram_name: .ascii CONFIG_CBFS_PREFIX - .string "/coreboot_ram" Modified: trunk/src/cpu/amd/car/copy_and_run.c ============================================================================== --- trunk/src/cpu/amd/car/copy_and_run.c Fri Apr 9 06:01:55 2010 (r5385) +++ trunk/src/cpu/amd/car/copy_and_run.c Fri Apr 9 12:12:18 2010 (r5386) @@ -19,13 +19,13 @@ void cbfs_and_run_core(const char *filename, unsigned ebp); -static void copy_and_run(unsigned cpu_reset) +static void __attribute__((regparm(0))) copy_and_run(unsigned cpu_reset) { cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset); } #if CONFIG_AP_CODE_IN_CAR == 1 -static void copy_and_run_ap_code_in_car(unsigned ret_addr) +static void __attribute__((regparm(0))) copy_and_run_ap_code_in_car(unsigned ret_addr) { cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ap", ret_addr); } Modified: trunk/src/cpu/x86/car/copy_and_run.c ============================================================================== --- trunk/src/cpu/x86/car/copy_and_run.c Fri Apr 9 06:01:55 2010 (r5385) +++ trunk/src/cpu/x86/car/copy_and_run.c Fri Apr 9 12:12:18 2010 (r5386) @@ -21,7 +21,7 @@ void cbfs_and_run_core(const char *filename, unsigned ebp); -static void copy_and_run(unsigned cpu_reset) +static void __attribute__((regparm(0))) copy_and_run(unsigned cpu_reset) { if (cpu_reset == 1) cpu_reset = -1; else cpu_reset = 0;

1 0

Error downloading source
by Joseph Smith 09 Apr '10

09 Apr '10

[joe@smitty2m ~]$ svn co svn://coreboot.org/coreboot/trunk coreboot svn: Can't find a temporary directory: Internal error Googling around it looks like eithor /tmp on the server is not writable or the diskspace is full. -- Thanks, Joseph Smith Set-Top-Linux www.settoplinux.org

1 0

[commit] r5385 - in trunk/src/cpu/amd: model_10xxx model_fxx
by repository service 09 Apr '10

09 Apr '10

Author: myles Date: Fri Apr 9 06:01:55 2010 New Revision: 5385 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5385 Log: Indent model_fxx_init and model_10xx_init. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c trunk/src/cpu/amd/model_fxx/model_fxx_init.c Modified: trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c ============================================================================== --- trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c Fri Apr 9 05:41:23 2010 (r5384) +++ trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c Fri Apr 9 06:01:55 2010 (r5385) @@ -43,26 +43,24 @@ msr_t rdmsr_amd(u32 index) { - msr_t result; - __asm__ __volatile__ ( - "rdmsr" - : "=a" (result.lo), "=d" (result.hi) - : "c" (index), "D" (0x9c5a203a) - ); - return result; + msr_t result; + __asm__ __volatile__( + "rdmsr" + :"=a"(result.lo), "=d"(result.hi) + :"c"(index), "D"(0x9c5a203a) + ); + return result; } - void wrmsr_amd(u32 index, msr_t msr) { - __asm__ __volatile__ ( + __asm__ __volatile__( "wrmsr" - : /* No outputs */ - : "c" (index), "a" (msr.lo), "d" (msr.hi), "D" (0x9c5a203a) - ); + : /* No outputs */ + :"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a) + ); } - static void model_10xxx_init(device_t dev) { u8 i; @@ -72,7 +70,7 @@ u32 siblings; #endif - id = get_node_core_id(read_nb_cfg_54()); /* nb_cfg_54 can not be set */ + id = get_node_core_id(read_nb_cfg_54()); /* nb_cfg_54 can not be set */ printk(BIOS_DEBUG, "nodeid = %02d, coreid = %02d\n", id.nodeid, id.coreid); /* Turn on caching if we haven't already */ @@ -85,11 +83,10 @@ /* zero the machine check error status registers */ msr.lo = 0; msr.hi = 0; - for(i=0; i < 5; i++) { - wrmsr(MCI_STATUS + (i * 4),msr); + for (i = 0; i < 5; i++) { + wrmsr(MCI_STATUS + (i * 4), msr); } - enable_cache(); /* Enable the local cpu apics */ @@ -107,7 +104,7 @@ wrmsr_amd(CPU_ID_FEATURES_MSR, msr); msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR); - msr.hi |= 1 << (33-32); + msr.hi |= 1 << (33 - 32); wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr); } printk(BIOS_DEBUG, "siblings = %02d, ", siblings); @@ -115,7 +112,7 @@ /* DisableCf8ExtCfg */ msr = rdmsr(NB_CFG_MSR); - msr.hi &= ~(1 << (46-32)); + msr.hi &= ~(1 << (46 - 32)); wrmsr(NB_CFG_MSR, msr); /* Write protect SMM space with SMMLOCK. */ @@ -128,6 +125,7 @@ static struct device_operations cpu_dev_ops = { .init = model_10xxx_init, }; + static struct cpu_device_id cpu_table[] = { //AMD_GH_SUPPORT { X86_VENDOR_AMD, 0x100f00 }, /* SH-F0 L1 */ @@ -144,7 +142,8 @@ { X86_VENDOR_AMD, 0x100F80 }, /* HY-D0 */ { 0, 0 }, }; + static const struct cpu_driver model_10xxx __cpu_driver = { - .ops = &cpu_dev_ops, + .ops = &cpu_dev_ops, .id_table = cpu_table, }; Modified: trunk/src/cpu/amd/model_fxx/model_fxx_init.c ============================================================================== --- trunk/src/cpu/amd/model_fxx/model_fxx_init.c Fri Apr 9 05:41:23 2010 (r5384) +++ trunk/src/cpu/amd/model_fxx/model_fxx_init.c Fri Apr 9 06:01:55 2010 (r5385) @@ -44,66 +44,66 @@ #if CONFIG_K8_REV_F_SUPPORT == 0 int is_e0_later_in_bsp(int nodeid) { - uint32_t val; - uint32_t val_old; - int e0_later; - if(nodeid==0) { // we don't need to do that for node 0 in core0/node0 - return !is_cpu_pre_e0(); - } - // d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0 - device_t dev; - dev = dev_find_slot(0, PCI_DEVFN(0x18+nodeid,2)); - if(!dev) return 0; - val_old = pci_read_config32(dev, 0x80); - val = val_old; - val |= (1<<3); - pci_write_config32(dev, 0x80, val); - val = pci_read_config32(dev, 0x80); - e0_later = !!(val & (1<<3)); - if(e0_later) { // pre_e0 bit 3 always be 0 and can not be changed - pci_write_config32(dev, 0x80, val_old); // restore it - } + uint32_t val; + uint32_t val_old; + int e0_later; + if (nodeid == 0) { // we don't need to do that for node 0 in core0/node0 + return !is_cpu_pre_e0(); + } + // d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0 + device_t dev; + dev = dev_find_slot(0, PCI_DEVFN(0x18 + nodeid, 2)); + if (!dev) + return 0; + val_old = pci_read_config32(dev, 0x80); + val = val_old; + val |= (1 << 3); + pci_write_config32(dev, 0x80, val); + val = pci_read_config32(dev, 0x80); + e0_later = !!(val & (1 << 3)); + if (e0_later) { // pre_e0 bit 3 always be 0 and can not be changed + pci_write_config32(dev, 0x80, val_old); // restore it + } - return e0_later; + return e0_later; } #endif #if CONFIG_K8_REV_F_SUPPORT == 1 int is_cpu_f0_in_bsp(int nodeid) { - uint32_t dword; - device_t dev; - dev = dev_find_slot(0, PCI_DEVFN(0x18+nodeid, 3)); - dword = pci_read_config32(dev, 0xfc); - return (dword & 0xfff00) == 0x40f00; + uint32_t dword; + device_t dev; + dev = dev_find_slot(0, PCI_DEVFN(0x18 + nodeid, 3)); + dword = pci_read_config32(dev, 0xfc); + return (dword & 0xfff00) == 0x40f00; } #endif #define MCI_STATUS 0x401 -static inline msr_t rdmsr_amd(unsigned index) +static inline msr_t rdmsr_amd(u32 index) { - msr_t result; - __asm__ __volatile__ ( - "rdmsr" - : "=a" (result.lo), "=d" (result.hi) - : "c" (index), "D" (0x9c5a203a) - ); - return result; -} - -static inline void wrmsr_amd(unsigned index, msr_t msr) -{ - __asm__ __volatile__ ( - "wrmsr" - : /* No outputs */ - : "c" (index), "a" (msr.lo), "d" (msr.hi), "D" (0x9c5a203a) - ); + msr_t result; + __asm__ __volatile__( + "rdmsr" + :"=a"(result.lo), "=d"(result.hi) + :"c"(index), "D"(0x9c5a203a) + ); + return result; +} + +static inline void wrmsr_amd(u32 index, msr_t msr) +{ + __asm__ __volatile__( + "wrmsr" + : /* No outputs */ + :"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a) + ); } - #define MTRR_COUNT 8 -#define ZERO_CHUNK_KB 0x800UL /* 2M */ +#define ZERO_CHUNK_KB 0x800UL /* 2M */ #define TOLM_KB 0x400000UL struct mtrr { @@ -119,11 +119,11 @@ static void save_mtrr_state(struct mtrr_state *state) { int i; - for(i = 0; i < MTRR_COUNT; i++) { + for (i = 0; i < MTRR_COUNT; i++) { state->mtrrs[i].base = rdmsr(MTRRphysBase_MSR(i)); state->mtrrs[i].mask = rdmsr(MTRRphysMask_MSR(i)); } - state->top_mem = rdmsr(TOP_MEM); + state->top_mem = rdmsr(TOP_MEM); state->top_mem2 = rdmsr(TOP_MEM2); state->def_type = rdmsr(MTRRdefType_MSR); } @@ -133,34 +133,33 @@ int i; disable_cache(); - for(i = 0; i < MTRR_COUNT; i++) { + for (i = 0; i < MTRR_COUNT; i++) { wrmsr(MTRRphysBase_MSR(i), state->mtrrs[i].base); wrmsr(MTRRphysMask_MSR(i), state->mtrrs[i].mask); } - wrmsr(TOP_MEM, state->top_mem); - wrmsr(TOP_MEM2, state->top_mem2); + wrmsr(TOP_MEM, state->top_mem); + wrmsr(TOP_MEM2, state->top_mem2); wrmsr(MTRRdefType_MSR, state->def_type); enable_cache(); } - #if 0 static void print_mtrr_state(struct mtrr_state *state) { int i; - for(i = 0; i < MTRR_COUNT; i++) { + for (i = 0; i < MTRR_COUNT; i++) { printk(BIOS_DEBUG, "var mtrr %d: %08x%08x mask: %08x%08x\n", - i, - state->mtrrs[i].base.hi, state->mtrrs[i].base.lo, - state->mtrrs[i].mask.hi, state->mtrrs[i].mask.lo); + i, + state->mtrrs[i].base.hi, state->mtrrs[i].base.lo, + state->mtrrs[i].mask.hi, state->mtrrs[i].mask.lo); } printk(BIOS_DEBUG, "top_mem: %08x%08x\n", - state->top_mem.hi, state->top_mem.lo); + state->top_mem.hi, state->top_mem.lo); printk(BIOS_DEBUG, "top_mem2: %08x%08x\n", - state->top_mem2.hi, state->top_mem2.lo); + state->top_mem2.hi, state->top_mem2.lo); printk(BIOS_DEBUG, "def_type: %08x%08x\n", - state->def_type.hi, state->def_type.lo); + state->def_type.hi, state->def_type.lo); } #endif @@ -171,7 +170,7 @@ disable_cache(); /* First clear all of the msrs to be safe */ - for(i = 0; i < MTRR_COUNT; i++) { + for (i = 0; i < MTRR_COUNT; i++) { msr_t zero; zero.lo = zero.hi = 0; wrmsr(MTRRphysBase_MSR(i), zero); @@ -199,46 +198,47 @@ enable_cache(); } -static inline void clear_2M_ram(unsigned long basek, struct mtrr_state *mtrr_state) +static inline void clear_2M_ram(unsigned long basek, + struct mtrr_state *mtrr_state) { - unsigned long limitk; - unsigned long size; - void *addr; + unsigned long limitk; + unsigned long size; + void *addr; - /* Report every 64M */ - if ((basek % (64*1024)) == 0) { + /* Report every 64M */ + if ((basek % (64 * 1024)) == 0) { - /* Restore the normal state */ - map_2M_page(0); - restore_mtrr_state(mtrr_state); - enable_lapic(); + /* Restore the normal state */ + map_2M_page(0); + restore_mtrr_state(mtrr_state); + enable_lapic(); - /* Print a status message */ - printk(BIOS_DEBUG, "%c", (basek >= TOLM_KB)?'+':'-'); + /* Print a status message */ + printk(BIOS_DEBUG, "%c", (basek >= TOLM_KB) ? '+' : '-'); - /* Return to the initialization state */ - set_init_ecc_mtrrs(); - disable_lapic(); + /* Return to the initialization state */ + set_init_ecc_mtrrs(); + disable_lapic(); - } + } - limitk = (basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1); + limitk = (basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1); #if 0 - /* couldn't happen, memory must on 2M boundary */ - if(limitk>endk) { - limitk = enk; - } + /* couldn't happen, memory must on 2M boundary */ + if (limitk > endk) { + limitk = enk; + } #endif - size = (limitk - basek) << 10; - addr = map_2M_page(basek >> 11); - if (addr == MAPPING_ERROR) { - printk(BIOS_ERR, "Cannot map page: %lx\n", basek >> 11); - return; - } - - /* clear memory 2M (limitk - basek) */ - addr = (void *)(((uint32_t)addr) | ((basek & 0x7ff) << 10)); - memset(addr, 0, size); + size = (limitk - basek) << 10; + addr = map_2M_page(basek >> 11); + if (addr == MAPPING_ERROR) { + printk(BIOS_ERR, "Cannot map page: %lx\n", basek >> 11); + return; + } + + /* clear memory 2M (limitk - basek) */ + addr = (void *)(((uint32_t) addr) | ((basek & 0x7ff) << 10)); + memset(addr, 0, size); } static void init_ecc_memory(unsigned node_id) @@ -271,14 +271,15 @@ /* Enable cache scrubbing at the lowest possible rate */ if (enable_scrubbing) { pci_write_config32(f3_dev, SCRUB_CONTROL, - (SCRUB_84ms << 16) | (SCRUB_84ms << 8) | (SCRUB_NONE << 0)); + (SCRUB_84ms << 16) | (SCRUB_84ms << 8) | + (SCRUB_NONE << 0)); } else { pci_write_config32(f3_dev, SCRUB_CONTROL, - (SCRUB_NONE << 16) | (SCRUB_NONE << 8) | (SCRUB_NONE << 0)); + (SCRUB_NONE << 16) | (SCRUB_NONE << 8) | + (SCRUB_NONE << 0)); printk(BIOS_DEBUG, "Scrubbing Disabled\n"); } - /* If ecc support is not enabled don't touch memory */ dcl = pci_read_config32(f2_dev, DRAM_CONFIG_LOW); if (!(dcl & DCL_DimmEccEn)) { @@ -286,32 +287,33 @@ return; } - startk = (pci_read_config32(f1_dev, 0x40 + (node_id*8)) & 0xffff0000) >> 2; - endk = ((pci_read_config32(f1_dev, 0x44 + (node_id*8)) & 0xffff0000) >> 2) + 0x4000; + startk = + (pci_read_config32(f1_dev, 0x40 + (node_id * 8)) & 0xffff0000) >> 2; + endk = + ((pci_read_config32(f1_dev, 0x44 + (node_id * 8)) & 0xffff0000) >> + 2) + 0x4000; #if CONFIG_HW_MEM_HOLE_SIZEK != 0 unsigned long hole_startk = 0; - #if CONFIG_K8_REV_F_SUPPORT == 0 - if (!is_cpu_pre_e0()) - { - #endif - - uint32_t val; - val = pci_read_config32(f1_dev, 0xf0); - if(val & 1) { - hole_startk = ((val & (0xff<<24)) >> 10); - } - #if CONFIG_K8_REV_F_SUPPORT == 0 - } - #endif +#if CONFIG_K8_REV_F_SUPPORT == 0 + if (!is_cpu_pre_e0()) { #endif + uint32_t val; + val = pci_read_config32(f1_dev, 0xf0); + if (val & 1) { + hole_startk = ((val & (0xff << 24)) >> 10); + } +#if CONFIG_K8_REV_F_SUPPORT == 0 + } +#endif +#endif /* Don't start too early */ begink = startk; if (begink < (CONFIG_RAMTOP >> 10)) { - begink = (CONFIG_RAMTOP >>10); + begink = (CONFIG_RAMTOP >> 10); } printk(BIOS_DEBUG, "Clearing memory %luK - %luK: ", begink, endk); @@ -326,26 +328,22 @@ /* Walk through 2M chunks and zero them */ #if CONFIG_HW_MEM_HOLE_SIZEK != 0 /* here hole_startk can not be equal to begink, never. Also hole_startk is in 2M boundary, 64M? */ - if ( (hole_startk != 0) && ((begink < hole_startk) && (endk>(4*1024*1024)))) { - for(basek = begink; basek < hole_startk; - basek = ((basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1))) - { - clear_2M_ram(basek, &mtrr_state); - } - for(basek = 4*1024*1024; basek < endk; - basek = ((basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1))) - { - clear_2M_ram(basek, &mtrr_state); - } - } - else + if ((hole_startk != 0) + && ((begink < hole_startk) && (endk > (4 * 1024 * 1024)))) { + for (basek = begink; basek < hole_startk; + basek = ((basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1))) { + clear_2M_ram(basek, &mtrr_state); + } + for (basek = 4 * 1024 * 1024; basek < endk; + basek = ((basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1))) { + clear_2M_ram(basek, &mtrr_state); + } + } else #endif - for(basek = begink; basek < endk; - basek = ((basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1))) - { - clear_2M_ram(basek, &mtrr_state); - } - + for (basek = begink; basek < endk; + basek = ((basek + ZERO_CHUNK_KB) & ~(ZERO_CHUNK_KB - 1))) { + clear_2M_ram(basek, &mtrr_state); + } /* Restore the normal state */ map_2M_page(0); @@ -353,20 +351,20 @@ enable_lapic(); /* Set the scrub base address registers */ - pci_write_config32(f3_dev, SCRUB_ADDR_LOW, startk << 10); + pci_write_config32(f3_dev, SCRUB_ADDR_LOW, startk << 10); pci_write_config32(f3_dev, SCRUB_ADDR_HIGH, startk >> 22); /* Enable the scrubber? */ if (enable_scrubbing) { /* Enable scrubbing at the lowest possible rate */ pci_write_config32(f3_dev, SCRUB_CONTROL, - (SCRUB_84ms << 16) | (SCRUB_84ms << 8) | (SCRUB_84ms << 0)); + (SCRUB_84ms << 16) | (SCRUB_84ms << 8) | + (SCRUB_84ms << 0)); } printk(BIOS_DEBUG, " done\n"); } - static inline void k8_errata(void) { msr_t msr; @@ -384,7 +382,7 @@ /* Erratum 81... */ msr = rdmsr_amd(DC_CFG_MSR); - msr.lo |= (1 << 10); + msr.lo |= (1 << 10); wrmsr_amd(DC_CFG_MSR, msr); } @@ -432,12 +430,12 @@ msr.hi |= 1 << (43 - 32); wrmsr_amd(BU_CFG_MSR, msr); - if(is_cpu_d0()) { - /* Erratum 110 ...*/ + if (is_cpu_d0()) { + /* Erratum 110 ... */ msr = rdmsr_amd(CPU_ID_HYPER_EXT_FEATURES); - msr.hi |=1; + msr.hi |= 1; wrmsr_amd(CPU_ID_HYPER_EXT_FEATURES, msr); - } + } #endif #if CONFIG_K8_REV_F_SUPPORT == 0 @@ -445,9 +443,9 @@ #endif { /* Erratum 110 ... */ - msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR); - msr.hi |=1; - wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr); + msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR); + msr.hi |= 1; + wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr); } /* Erratum 122 */ @@ -456,10 +454,10 @@ wrmsr(HWCR_MSR, msr); #if CONFIG_K8_REV_F_SUPPORT == 1 - /* Erratum 131... */ - msr = rdmsr(NB_CFG_MSR); - msr.lo |= 1 << 20; - wrmsr(NB_CFG_MSR, msr); + /* Erratum 131... */ + msr = rdmsr(NB_CFG_MSR); + msr.lo |= 1 << 20; + wrmsr(NB_CFG_MSR, msr); #endif } @@ -474,7 +472,7 @@ msr_t msr; struct node_core_id id; #if CONFIG_LOGICAL_CPUS == 1 - unsigned siblings; + u32 siblings; #endif #if CONFIG_K8_REV_F_SUPPORT == 1 @@ -484,7 +482,7 @@ #endif #if CONFIG_USBDEBUG_DIRECT - if(!ehci_debug_addr) + if (!ehci_debug_addr) ehci_debug_addr = get_ehci_debug(); set_ehci_debug(0); #endif @@ -498,7 +496,7 @@ set_ehci_debug(ehci_debug_addr); #endif - /* Update the microcode */ + /* Update the microcode */ model_fxx_update_microcode(dev->device); disable_cache(); @@ -506,8 +504,8 @@ /* zero the machine check error status registers */ msr.lo = 0; msr.hi = 0; - for(i=0; i<5; i++) { - wrmsr(MCI_STATUS + (i*4),msr); + for (i = 0; i < 5; i++) { + wrmsr(MCI_STATUS + (i * 4), msr); } k8_errata(); @@ -526,34 +524,34 @@ setup_lapic(); #if CONFIG_LOGICAL_CPUS == 1 - siblings = cpuid_ecx(0x80000008) & 0xff; + siblings = cpuid_ecx(0x80000008) & 0xff; - if(siblings>0) { - msr = rdmsr_amd(CPU_ID_FEATURES_MSR); - msr.lo |= 1 << 28; - wrmsr_amd(CPU_ID_FEATURES_MSR, msr); + if (siblings > 0) { + msr = rdmsr_amd(CPU_ID_FEATURES_MSR); + msr.lo |= 1 << 28; + wrmsr_amd(CPU_ID_FEATURES_MSR, msr); - msr = rdmsr_amd(LOGICAL_CPUS_NUM_MSR); - msr.lo = (siblings+1)<<16; - wrmsr_amd(LOGICAL_CPUS_NUM_MSR, msr); + msr = rdmsr_amd(LOGICAL_CPUS_NUM_MSR); + msr.lo = (siblings + 1) << 16; + wrmsr_amd(LOGICAL_CPUS_NUM_MSR, msr); - msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR); - msr.hi |= 1<<(33-32); - wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr); + msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR); + msr.hi |= 1 << (33 - 32); + wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr); } - #endif - id = get_node_core_id(read_nb_cfg_54()); // pre e0 nb_cfg_54 can not be set + id = get_node_core_id(read_nb_cfg_54()); // pre e0 nb_cfg_54 can not be set /* Is this a bad location? In particular can another node prefecth * data from this node before we have initialized it? */ - if (id.coreid == 0) init_ecc_memory(id.nodeid); // only do it for core 0 + if (id.coreid == 0) + init_ecc_memory(id.nodeid); // only do it for core 0 #if CONFIG_LOGICAL_CPUS==1 - /* Start up my cpu siblings */ -// if(id.coreid==0) amd_sibling_init(dev); // Don't need core1 is already be put in the CPU BUS in bus_cpu_scan + /* Start up my cpu siblings */ +// if(id.coreid==0) amd_sibling_init(dev); // Don't need core1 is already be put in the CPU BUS in bus_cpu_scan #endif }

1 0

[PATCH] 440BX raminit cleanup
by Keith Hui 09 Apr '10

09 Apr '10

Attached patch does the following on 440BX RAM init code: 1. Restore DUMPNORTH() macro. dump_pci_device() never really went away, as romstages for all 440BX boards included lib/debug.c required for it. 2. Move the NB macro up and changed DUMPNORTH() to use it as well. 3. Resolves a number of TODO items. That also means filling in some additional register descriptions marked as such. 4. Change register_values[] static array from array of long to array of u8. Takes up only 1/4 of previous size and still do the same thing. 5. Remove the extra line that unconditionally sets SDRAMPWR, which is just wrong now that it is contained in register_values[] array and properly conditioned by a config option. 6. Small cosmetic tidy-ups. If I have submitted a previous patch for the same (I don't even remember now :-O), this patch supersedes it. abuild-tested on all 440BX targets. Boot tested on P2B-LS. Signed-off-by: Keith Hui <buurin(a)gmail.com> romstage boot log with detailed RAM init debug enabled: coreboot-4.0-r5383M Thu Apr 8 23:21:32 EDT 2010 starting... SMBus controller enabled Northbridge prior to SDRAM init: PCI: 00:00.00 00: 86 80 90 71 06 00 10 22 03 00 00 06 00 00 00 00 10: 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 a0 00 00 00 00 00 00 00 00 00 00 00 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 50: 04 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 60: 01 01 01 01 01 01 01 01 00 00 00 00 00 00 00 00 70: 00 1f 02 38 00 00 00 00 00 00 00 38 00 00 00 00 80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 90: 80 00 00 00 04 61 00 00 00 05 00 00 00 00 00 00 a0: 02 00 10 00 03 02 00 1f 00 00 00 00 00 00 00 00 b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 c0: 00 00 00 00 00 00 00 00 18 0c 00 00 00 00 00 00 d0: 00 00 00 00 00 00 00 00 0c 00 00 00 00 00 00 00 e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 f0: 00 00 00 00 00 f8 00 00 20 0f 00 00 00 00 00 00 Found DIMM in slot 00 Found DIMM in slot 01 PGPOL[BPR] has been set to 0x0f RPS has been set to 0x00a5 NBXECC[31:24] has been set to 0xff DRAMC has been set to 0x08 RAM Enable 1: Apply NOP RAM Enable 2: Precharge all RAM Enable 3: CBR RAM Enable 4: Mode register set RAM Enable 5: Normal operation RAM Enable 6: Enable refresh Enabling refresh (DRAMC = 0x09) for DIMM 00 Enabling refresh (DRAMC = 0x09) for DIMM 01 Northbridge following SDRAM init: PCI: 00:00.00 00: 86 80 90 71 06 00 10 22 03 00 00 06 00 00 00 00 10: 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 a0 00 00 00 00 00 00 00 00 00 00 00 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 50: 0c 80 00 ff 00 00 00 09 03 30 33 33 33 33 33 33 60: 08 10 20 30 30 30 30 30 00 ec 2b 00 a0 ba 00 00 70: 00 1f 02 38 a5 00 10 00 00 0f 10 38 10 00 00 00 80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 90: 80 00 00 00 04 61 00 00 00 05 00 00 00 00 00 00 a0: 02 00 10 00 03 02 00 1f 00 00 00 00 00 00 00 00 b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 c0: 00 00 00 00 00 00 00 00 18 0c e4 ff 5f 00 00 00 d0: 00 00 00 00 00 00 00 00 0c 00 00 00 00 00 00 00 e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 f0: 00 00 00 00 00 f8 00 00 20 0f 00 00 00 00 00 00 Testing DRAM : 00000000-000a0000 DRAM fill: 00000000-000a0000 000a0000 DRAM filled DRAM verify: 00000000-000a0000 000a0000 DRAM range verified. Done. Copying coreboot to RAM. Loading stage image. Check CBFS header at fffeffe0 magic is 4f524243 Found CBFS header at fffeffe0 Check fallback/coreboot_ram Stage: loading fallback/coreboot_ram @ 0x100000 (147456 bytes), entry @ 0x100000 Stage: done loading. Jumping to image.

1 0

[commit] r5286 - in trunk/src: mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/pistachio mainboard/amd/serengeti_cheetah mainboard/amd/serengeti_cheetah_fam1...
by repository service 09 Apr '10

09 Apr '10

Author: myles Date: Wed Mar 24 23:02:53 2010 New Revision: 5286 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5286 Log: Get rid of type-punned pointer errors. Defining AmlCode differently in different source files is a bit ugly... Creating a void * to do the casting is not exactly beautiful either... Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c trunk/src/mainboard/amd/mahogany/acpi_tables.c trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c trunk/src/mainboard/amd/pistachio/acpi_tables.c trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c trunk/src/mainboard/intel/d945gclf/acpi_tables.c trunk/src/mainboard/intel/eagleheights/acpi_tables.c trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c trunk/src/mainboard/kontron/kt690/acpi_tables.c trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c trunk/src/mainboard/roda/rk886ex/acpi_tables.c trunk/src/mainboard/technexion/tim5690/acpi_tables.c trunk/src/mainboard/technexion/tim8690/acpi_tables.c trunk/src/mainboard/tyan/s2891/acpi_tables.c trunk/src/mainboard/tyan/s2892/acpi_tables.c trunk/src/mainboard/tyan/s2895/acpi_tables.c trunk/src/mainboard/via/epia-m/acpi_tables.c trunk/src/mainboard/via/epia-m700/acpi_tables.c trunk/src/mainboard/via/epia-n/acpi_tables.c trunk/src/mainboard/via/vt8454c/acpi_tables.c trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -57,13 +57,13 @@ } #endif -extern u8 AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -219,25 +219,24 @@ ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { case 1: /* 8132 */ - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: /* 8151 */ - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: /* 8131 */ - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: /* HTX no io apic */ - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } - current += ((acpi_header_t *) p)->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *) p)->length); + current += p->length; + memcpy((void *)ssdtx, p, p->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; - ssdtx->checksum = - acpi_checksum((u8 *)ssdtx, ssdtx->length); + ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); acpi_add_table(rsdp, ssdtx); } #endif @@ -250,10 +249,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); - dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, (void *)AmlCode, - ((acpi_header_t *) AmlCode)->length); - current += dsdt->length; + dsdt = (acpi_header_t *)current; + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/amd/mahogany/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -57,13 +57,13 @@ } #endif -extern u8 AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -219,25 +219,24 @@ ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { case 1: /* 8132 */ - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: /* 8151 */ - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: /* 8131 */ - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: /* HTX no io apic */ - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } - current += ((acpi_header_t *) p)->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *) p)->length); + current += p->length; + memcpy((void *)ssdtx, p, p->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; - ssdtx->checksum = - acpi_checksum((u8 *)ssdtx, ssdtx->length); + ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); acpi_add_table(rsdp, ssdtx); } #endif @@ -251,8 +250,7 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, (void *)AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *)dsdt, &AmlCode, AmlCode.length); current += dsdt->length; printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ Modified: trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -46,14 +46,14 @@ } #endif -extern u8 AmlCode[]; -extern u8 AmlCode_ssdt[]; +extern const acpi_header_t AmlCode; +extern const acpi_header_t AmlCode_ssdt; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -130,7 +130,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - u8 *p; + acpi_header_t const *p; int i; @@ -192,8 +192,8 @@ current = ( current + 0x0f) & -0x10; printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current); ssdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode_ssdt)->length; - memcpy((void *)ssdt, (void *)AmlCode_ssdt, ((acpi_header_t *)AmlCode_ssdt)->length); + current += AmlCode_ssdt.length; + memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); //Here you need to set value in pci1234, sblk and sbdn in get_bus_conf.c update_ssdt((void*)ssdt); /* recalculate checksum */ @@ -223,20 +223,20 @@ ssdtx = (acpi_header_t *)current; switch(sysconf.hcid[i]) { case 1: - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: //8131 - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: //HTX no io apic - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; } current += ((acpi_header_t *)p)->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *)p)->length); + memcpy((void *)ssdtx, p, p->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((unsigned char *)ssdtx,ssdtx->length); @@ -248,9 +248,8 @@ current = ( current + 0x07) & -0x08; printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current); dsdt = (acpi_header_t *)current; // it will used by fadt - current += ((acpi_header_t *)AmlCode)->length; - memcpy((void *)dsdt,(void *)AmlCode, \ - ((acpi_header_t *)AmlCode)->length); + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); /* FACS */ // it needs 64 bit alignment Modified: trunk/src/mainboard/amd/pistachio/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -57,13 +57,13 @@ } #endif -extern u8 AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -219,17 +219,17 @@ ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { case 1: /* 8132 */ - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: /* 8151 */ - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: /* 8131 */ - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: /* HTX no io apic */ - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } current += ((acpi_header_t *) p)->length; @@ -251,8 +251,7 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, (void *)AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *)dsdt, &AmlCode, AmlCode.length); current += dsdt->length; printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -38,11 +38,11 @@ } #endif -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern unsigned char AmlCode_ssdt2[]; -extern unsigned char AmlCode_ssdt3[]; -extern unsigned char AmlCode_ssdt4[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -198,7 +198,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - unsigned char *p; + acpi_header_t const *p; int i; @@ -279,13 +279,13 @@ ssdtx = (acpi_header_t *)current; switch(sysconf.hcid[i]) { case 1: //8132 - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: //8151 - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: //8131 - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: continue; @@ -308,9 +308,8 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode)->length; - memcpy((void *)dsdt,(void *)AmlCode, \ - ((acpi_header_t *)AmlCode)->length); + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); /* FDAT */ Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -46,14 +46,14 @@ } #endif -extern u8 AmlCode[]; -extern u8 AmlCode_ssdt[]; +extern const acpi_header_t AmlCode; +extern const acpi_header_t AmlCode_ssdt; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -202,7 +202,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - u8 *p; + acpi_header_t const *p; int i; @@ -264,8 +264,8 @@ current = ( current + 0x0f) & -0x10; printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current); ssdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode_ssdt)->length; - memcpy((void *)ssdt, (void *)AmlCode_ssdt, ((acpi_header_t *)AmlCode_ssdt)->length); + current += AmlCode_ssdt.length; + memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); //Here you need to set value in pci1234, sblk and sbdn in get_bus_conf.c update_ssdt((void*)ssdt); /* recalculate checksum */ @@ -295,24 +295,24 @@ ssdtx = (acpi_header_t *)current; switch(sysconf.hcid[i]) { case 1: - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: //8131 - p = AmlCode_ssdt4; - break; - default: + p = &AmlCode_ssdt4; + break; + default: //HTX no io apic - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; } - current += ((acpi_header_t *)p)->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *)p)->length); + current += p->length; + memcpy((void *)ssdtx, p, p->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; - ssdtx->checksum = acpi_checksum((unsigned char *)ssdtx,ssdtx->length); - acpi_add_table(rsdp,ssdtx); + ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); + acpi_add_table(rsdp, ssdtx); } #endif @@ -320,10 +320,9 @@ current = ( current + 0x07) & -0x08; printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current); dsdt = (acpi_header_t *)current; // it will used by fadt - current += ((acpi_header_t *)AmlCode)->length; - memcpy((void *)dsdt,(void *)AmlCode, \ - ((acpi_header_t *)AmlCode)->length); - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); + printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FACS */ // it needs 64 bit alignment current = ( current + 0x07) & -0x08; Modified: trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -31,7 +31,7 @@ #include <../../../southbridge/via/vt8237r/vt8237r.h> #include <../../../southbridge/via/k8t890/k8t890.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -118,9 +118,8 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, Modified: trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -33,7 +33,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -133,9 +133,8 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, Modified: trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -34,7 +34,7 @@ #include <device/pci.h> #include <cpu/amd/amdk8_sysconf.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -143,9 +143,8 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, Modified: trunk/src/mainboard/intel/d945gclf/acpi_tables.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/intel/d945gclf/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -31,8 +31,7 @@ #define OLD_ACPI 0 -extern unsigned char AmlCode[]; -void *amlcodeptr = &AmlCode; +extern const acpi_header_t AmlCode; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -273,10 +272,9 @@ ALIGN_CURRENT; acpi_create_facs(facs); - int len = ((acpi_header_t *) amlcodeptr)->length; dsdt = (acpi_header_t *) current; - current += len; - memcpy((void *) dsdt, amlcodeptr, len); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); #if OLD_ACPI for (i=0; i < dsdt->length; i++) { Modified: trunk/src/mainboard/intel/eagleheights/acpi_tables.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/intel/eagleheights/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -28,7 +28,7 @@ #include <device/pci_ids.h> #include "ioapic.h" -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -206,10 +206,9 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; + current += AmlCode.length; ALIGN_CURRENT; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); Modified: trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -38,13 +38,13 @@ } #endif -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern unsigned char AmlCode_ssdt2[]; -extern unsigned char AmlCode_ssdt3[]; -extern unsigned char AmlCode_ssdt4[]; -extern unsigned char AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -201,7 +201,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - unsigned char *p; + acpi_header_t const *p; int i; @@ -282,17 +282,17 @@ ssdtx = (acpi_header_t *)current; switch(sysconf.hcid[i]) { case 1: //8132 - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: //8151 - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: //8131 - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: //HTX no io apic - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } current += ((acpi_header_t *)p)->length; @@ -313,9 +313,8 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode)->length; - memcpy((void *)dsdt,(void *)AmlCode, \ - ((acpi_header_t *)AmlCode)->length); + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); /* FDAT */ Modified: trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -29,8 +29,7 @@ #include <cpu/x86/msr.h> #include "dmi.h" -extern unsigned char AmlCode[]; -void *amlcodeptr = &AmlCode; +extern const acpi_header_t AmlCode; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -204,10 +203,9 @@ ALIGN_CURRENT; acpi_create_facs(facs); - int len = ((acpi_header_t *) amlcodeptr)->length; dsdt = (acpi_header_t *) current; - current += len; - memcpy((void *) dsdt, amlcodeptr, len); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); ALIGN_CURRENT; Modified: trunk/src/mainboard/kontron/kt690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -57,13 +57,13 @@ } #endif -extern u8 AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -219,17 +219,17 @@ ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { case 1: /* 8132 */ - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: /* 8151 */ - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: /* 8131 */ - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: /* HTX no io apic */ - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } current += ((acpi_header_t *) p)->length; @@ -251,8 +251,7 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, (void *)AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *)dsdt, &AmlCode, AmlCode.length); current += dsdt->length; printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ Modified: trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -35,7 +35,7 @@ #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -147,9 +147,8 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, Modified: trunk/src/mainboard/roda/rk886ex/acpi_tables.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/roda/rk886ex/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -30,8 +30,7 @@ #include <device/pci_ids.h> #include "dmi.h" -extern unsigned char AmlCode[]; -void *amlcodeptr = &AmlCode; +extern const acpi_header_t AmlCode; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -273,10 +272,9 @@ ALIGN_CURRENT; acpi_create_facs(facs); - int len = ((acpi_header_t *)amlcodeptr)->length; dsdt = (acpi_header_t *) current; - current += len; - memcpy((void *) dsdt, amlcodeptr, len); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); /* Fix up global NVS region for SMI handler. The GNVS region lives * in the (high) table area. The low memory map looks like this: Modified: trunk/src/mainboard/technexion/tim5690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -57,13 +57,13 @@ } #endif -extern u8 AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -219,17 +219,17 @@ ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { case 1: /* 8132 */ - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: /* 8151 */ - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: /* 8131 */ - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: /* HTX no io apic */ - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } current += ((acpi_header_t *) p)->length; @@ -251,8 +251,7 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, (void *)AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *)dsdt, &AmlCode, AmlCode.length); current += dsdt->length; printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ Modified: trunk/src/mainboard/technexion/tim8690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -57,13 +57,13 @@ } #endif -extern u8 AmlCode[]; +extern const acpi_header_t AmlCode; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern u8 AmlCode_ssdt2[]; -extern u8 AmlCode_ssdt3[]; -extern u8 AmlCode_ssdt4[]; -extern u8 AmlCode_ssdt5[]; +extern const acpi_header_t AmlCode_ssdt2; +extern const acpi_header_t AmlCode_ssdt3; +extern const acpi_header_t AmlCode_ssdt4; +extern const acpi_header_t AmlCode_ssdt5; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -219,17 +219,17 @@ ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { case 1: /* 8132 */ - p = AmlCode_ssdt2; + p = &AmlCode_ssdt2; break; case 2: /* 8151 */ - p = AmlCode_ssdt3; + p = &AmlCode_ssdt3; break; case 3: /* 8131 */ - p = AmlCode_ssdt4; + p = &AmlCode_ssdt4; break; default: /* HTX no io apic */ - p = AmlCode_ssdt5; + p = &AmlCode_ssdt5; break; } current += ((acpi_header_t *) p)->length; @@ -251,8 +251,7 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, (void *)AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *)dsdt, &AmlCode, AmlCode.length); current += dsdt->length; printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ Modified: trunk/src/mainboard/tyan/s2891/acpi_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/tyan/s2891/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -20,7 +20,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -139,8 +139,8 @@ current = ALIGN(current, 16); dsdt = (acpi_header_t *) current; printk(BIOS_DEBUG, "ACPI: * DSDT %p\n", dsdt); - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void*) dsdt, (void*)AmlCode, ((acpi_header_t*)AmlCode)->length); + current += AmlCode.length; + memcpy((void*) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); current = ALIGN(current, 16); Modified: trunk/src/mainboard/tyan/s2892/acpi_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/tyan/s2892/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -20,7 +20,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -139,8 +139,8 @@ current = ALIGN(current, 16); dsdt = (acpi_header_t *) current; printk(BIOS_DEBUG, "ACPI: * DSDT %p\n", dsdt); - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void*) dsdt, (void*)AmlCode, ((acpi_header_t*)AmlCode)->length); + current += AmlCode.length; + memcpy((void*) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); current = ALIGN(current, 16); Modified: trunk/src/mainboard/tyan/s2895/acpi_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/tyan/s2895/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -20,7 +20,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -164,8 +164,8 @@ current = ALIGN(current, 16); dsdt = (acpi_header_t *) current; printk(BIOS_DEBUG, "ACPI: * DSDT %p\n", dsdt); - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void*) dsdt, (void*)AmlCode, ((acpi_header_t*)AmlCode)->length); + current += AmlCode.length; + memcpy((void*) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); current = ALIGN(current, 16); Modified: trunk/src/mainboard/via/epia-m/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/epia-m/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/via/epia-m/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -11,7 +11,7 @@ #include <string.h> #include <arch/acpi.h> -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -75,8 +75,8 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode)->length; - memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length); + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = acpi_checksum(dsdt,dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); Modified: trunk/src/mainboard/via/epia-m700/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/via/epia-m700/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -35,8 +35,8 @@ #include <device/pci_ids.h> #include <../../../northbridge/via/vx800/vx800.h> -extern unsigned char AmlCode_dsdt[]; -extern unsigned char AmlCode_ssdt[]; +extern const acpi_header_t AmlCode_dsdt; +extern const acpi_header_t AmlCode_ssdt; extern u32 wake_vec; @@ -158,9 +158,8 @@ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode_dsdt)->length; - memcpy((void *)dsdt, (void *)AmlCode_dsdt, - ((acpi_header_t *) AmlCode_dsdt)->length); + current += AmlCode_dsdt.length; + memcpy((void *)dsdt, &AmlCode_dsdt, AmlCode_dsdt.length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); @@ -190,8 +189,8 @@ #if 0 printk(BIOS_DEBUG, "ACPI: * SSDT\n"); ssdt = (acpi_header_t *) current; - current += ((acpi_header_t *)AmlCode_ssdt)->length; - memcpy((void *)ssdt,(void *)AmlCode_ssdt, ((acpi_header_t *)AmlCode_ssdt)->length); + current += AmlCode_ssdt.length; + memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); ssdt->checksum = 0; /* Don't trust iasl to get this right. */ ssdt->checksum = acpi_checksum(ssdt, ssdt->length); acpi_add_table(rsdp, ssdt); Modified: trunk/src/mainboard/via/epia-n/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/epia-n/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/via/epia-n/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -35,7 +35,7 @@ #include <device/pci_ids.h> #include "../../../southbridge/via/vt8237r/vt8237r.h" -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; /* * These four macros are copied from <arch/smp/mpspec.h>, I have to do this @@ -161,8 +161,8 @@ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode)->length; - memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length); + current += AmlCode.length; + memcpy((void *)dsdt, &AmlCode, AmlCode.length); dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = acpi_checksum(dsdt,dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); Modified: trunk/src/mainboard/via/vt8454c/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/vt8454c/acpi_tables.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/mainboard/via/vt8454c/acpi_tables.c Wed Mar 24 23:02:53 2010 (r5286) @@ -27,7 +27,7 @@ #include <device/pci_ids.h> #include "dmi.h" -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -180,9 +180,8 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode,AmlCode.length); #if DONT_TRUST_IASL dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = acpi_checksum(dsdt, dsdt->length); Modified: trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c ============================================================================== --- trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Wed Mar 24 22:24:17 2010 (r5285) +++ trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Wed Mar 24 23:02:53 2010 (r5286) @@ -305,11 +305,11 @@ } } -extern unsigned char AmlCode_sspr5[]; -extern unsigned char AmlCode_sspr4[]; -extern unsigned char AmlCode_sspr3[]; -extern unsigned char AmlCode_sspr2[]; -extern unsigned char AmlCode_sspr1[]; +extern const acpi_header_t AmlCode_sspr5; +extern const acpi_header_t AmlCode_sspr4; +extern const acpi_header_t AmlCode_sspr3; +extern const acpi_header_t AmlCode_sspr2; +extern const acpi_header_t AmlCode_sspr1; /* fixme: find one good way for different p_state_num */ unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current) @@ -321,13 +321,13 @@ if(!sysconf.p_state_num) return current; - u8 *AmlCode_sspr; + acpi_header_t *AmlCode_sspr; switch(sysconf.p_state_num) { - case 1: AmlCode_sspr = AmlCode_sspr1; break; - case 2: AmlCode_sspr = AmlCode_sspr2; break; - case 3: AmlCode_sspr = AmlCode_sspr3; break; - case 4: AmlCode_sspr = AmlCode_sspr4; break; - default: AmlCode_sspr = AmlCode_sspr5; break; + case 1: AmlCode_sspr = &AmlCode_sspr1; break; + case 2: AmlCode_sspr = &AmlCode_sspr2; break; + case 3: AmlCode_sspr = &AmlCode_sspr3; break; + case 4: AmlCode_sspr = &AmlCode_sspr4; break; + default: AmlCode_sspr = &AmlCode_sspr5; break; } for(cpu = all_devices; cpu; cpu = cpu->next) { @@ -342,8 +342,8 @@ current = ( current + 0x0f) & -0x10; ssdt = (acpi_header_t *)current; - current += ((acpi_header_t *)AmlCode_sspr)->length; - memcpy((void *)ssdt, (void *)AmlCode_sspr, ((acpi_header_t *)AmlCode_sspr)->length); + current += AmlCode_sspr->length; + memcpy((void *)ssdt, AmlCode_sspr, AmlCode_sspr->length); update_sspr((void*)ssdt,cpu->path.apic.node_id, cpu_index); /* recalculate checksum */ ssdt->checksum = 0;

5 27

[commit] r5384 - in trunk/src: mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/pistachio mainboard/amd/serengeti_cheetah mainboard/amd/serengeti_cheetah_fam1...
by repository service 09 Apr '10

09 Apr '10

Author: myles Date: Fri Apr 9 05:41:23 2010 New Revision: 5384 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5384 Log: Copy acpi blobs in two parts to make sure gcc does the right thing. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c trunk/src/mainboard/amd/mahogany/acpi_tables.c trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c trunk/src/mainboard/amd/pistachio/acpi_tables.c trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c trunk/src/mainboard/intel/d945gclf/acpi_tables.c trunk/src/mainboard/intel/eagleheights/acpi_tables.c trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c trunk/src/mainboard/kontron/kt690/acpi_tables.c trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c trunk/src/mainboard/roda/rk886ex/acpi_tables.c trunk/src/mainboard/technexion/tim5690/acpi_tables.c trunk/src/mainboard/technexion/tim8690/acpi_tables.c trunk/src/mainboard/tyan/s2891/acpi_tables.c trunk/src/mainboard/tyan/s2892/acpi_tables.c trunk/src/mainboard/tyan/s2895/acpi_tables.c trunk/src/mainboard/via/epia-m/acpi_tables.c trunk/src/mainboard/via/epia-m700/acpi_tables.c trunk/src/mainboard/via/epia-n/acpi_tables.c trunk/src/mainboard/via/vt8454c/acpi_tables.c trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/amd/dbm690t/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,7 +57,7 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #define IO_APIC_ADDR 0xfec00000UL @@ -187,8 +187,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *)current; - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/amd/mahogany/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/amd/mahogany/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,13 +57,13 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; -extern const acpi_header_t AmlCode_ssdt5; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; +extern const unsigned char AmlCode_ssdt5[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -144,7 +144,7 @@ acpi_header_t *ssdt; #if CONFIG_ACPI_SSDTX_NUM >= 1 acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; #endif @@ -223,8 +223,9 @@ p = &AmlCode_ssdt5; break; } - current += p->length; - memcpy((void *)ssdtx, p, p->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); @@ -240,9 +241,10 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); - dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + dsdt = (acpi_header_t *)current; + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -46,14 +46,14 @@ } #endif -extern const acpi_header_t AmlCode; -extern const acpi_header_t AmlCode_ssdt; +extern const unsigned char AmlCode[]; +extern const unsigned char AmlCode_ssdt[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; -extern const acpi_header_t AmlCode_ssdt5; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; +extern const unsigned char AmlCode_ssdt5[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -132,7 +132,7 @@ acpi_header_t *ssdt; #if CONFIG_ACPI_SSDTX_NUM >= 1 acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; #endif @@ -194,8 +194,9 @@ current = ( current + 0x0f) & -0x10; printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current); ssdt = (acpi_header_t *)current; - current += AmlCode_ssdt.length; - memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); + memcpy(ssdt, &AmlCode_ssdt, sizeof(acpi_header_t)); + current += ssdt->length; + memcpy(ssdt, &AmlCode_ssdt, ssdt->length); //Here you need to set value in pci1234, sblk and sbdn in get_bus_conf.c update_ssdt((void*)ssdt); /* recalculate checksum */ @@ -237,8 +238,9 @@ p = &AmlCode_ssdt5; break; } - current += p->length; - memcpy((void *)ssdtx, p, p->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); @@ -250,8 +252,9 @@ current = ( current + 0x07) & -0x08; printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current); dsdt = (acpi_header_t *)current; // it will used by fadt - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); /* FACS */ // it needs 64 bit alignment Modified: trunk/src/mainboard/amd/pistachio/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/amd/pistachio/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,7 +57,7 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #define IO_APIC_ADDR 0xfec00000UL @@ -187,9 +187,10 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); - + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); + printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -38,11 +38,11 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -194,7 +194,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; @@ -285,8 +285,9 @@ default: continue; } - current += p->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *)p)->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); @@ -303,8 +304,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current); dsdt = (acpi_header_t *)current; - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FDAT */ Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -46,14 +46,14 @@ } #endif -extern const acpi_header_t AmlCode; -extern const acpi_header_t AmlCode_ssdt; +extern const unsigned char AmlCode[]; +extern const unsigned char AmlCode_ssdt[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; -extern const acpi_header_t AmlCode_ssdt5; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; +extern const unsigned char AmlCode_ssdt5[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -200,7 +200,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; @@ -262,8 +262,9 @@ current = ( current + 0x0f) & -0x10; printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current); ssdt = (acpi_header_t *)current; - current += AmlCode_ssdt.length; - memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); + memcpy(ssdt, &AmlCode_ssdt, sizeof(acpi_header_t)); + current += ssdt->length; + memcpy(ssdt, &AmlCode_ssdt, ssdt->length); //Here you need to set value in pci1234, sblk and sbdn in get_bus_conf.c update_ssdt((void*)ssdt); /* recalculate checksum */ @@ -305,8 +306,9 @@ //HTX no io apic p = &AmlCode_ssdt5; } - current += p->length; - memcpy((void *)ssdtx, p, p->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); @@ -318,8 +320,9 @@ current = ( current + 0x07) & -0x08; printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current); dsdt = (acpi_header_t *)current; - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FACS */ // it needs 64 bit alignment Modified: trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,13 +57,13 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; -extern const acpi_header_t AmlCode_ssdt5; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; +extern const unsigned char AmlCode_ssdt5[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -144,7 +144,7 @@ acpi_header_t *ssdt; #if CONFIG_ACPI_SSDTX_NUM >= 1 acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; #endif @@ -223,8 +223,9 @@ p = &AmlCode_ssdt5; break; } - current += p->length; - memcpy((void *)ssdtx, p, p->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); @@ -240,9 +241,10 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); - dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + dsdt = (acpi_header_t *)current; + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -31,7 +31,7 @@ #include <../../../southbridge/via/vt8237r/vt8237r.h> #include <../../../southbridge/via/k8t890/k8t890.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -117,11 +117,12 @@ current += sizeof(acpi_facs_t); acpi_create_facs(facs); - dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + dsdt = (acpi_header_t *)current; + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ - dsdt->checksum = acpi_checksum(dsdt, dsdt->length); + dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -33,7 +33,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -133,10 +133,11 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ - dsdt->checksum = acpi_checksum(dsdt, dsdt->length); + dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -34,7 +34,7 @@ #include <device/pci.h> #include <cpu/amd/amdk8_sysconf.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -143,10 +143,11 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ - dsdt->checksum = acpi_checksum(dsdt, dsdt->length); + dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/intel/d945gclf/acpi_tables.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/intel/d945gclf/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -31,7 +31,7 @@ #define OLD_ACPI 0 -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -273,8 +273,9 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); #if OLD_ACPI for (i=0; i < dsdt->length; i++) { Modified: trunk/src/mainboard/intel/eagleheights/acpi_tables.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/intel/eagleheights/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -28,7 +28,7 @@ #include <device/pci_ids.h> #include "ioapic.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -204,9 +204,10 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); ALIGN_CURRENT; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); Modified: trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -38,13 +38,13 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; -extern const acpi_header_t AmlCode_ssdt5; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; +extern const unsigned char AmlCode_ssdt5[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -201,7 +201,7 @@ acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; @@ -295,8 +295,9 @@ p = &AmlCode_ssdt5; break; } - current += ((acpi_header_t *)p)->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *)p)->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((unsigned char *)ssdtx,ssdtx->length); @@ -313,8 +314,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *)current; - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); /* FDAT */ Modified: trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/kontron/986lcd-m/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -29,7 +29,7 @@ #include <cpu/x86/msr.h> #include "dmi.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -204,8 +204,9 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); ALIGN_CURRENT; Modified: trunk/src/mainboard/kontron/kt690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/kontron/kt690/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,7 +57,7 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #define IO_APIC_ADDR 0xfec00000UL @@ -187,8 +187,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -35,7 +35,7 @@ #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -147,8 +147,9 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, Modified: trunk/src/mainboard/roda/rk886ex/acpi_tables.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/roda/rk886ex/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -30,7 +30,7 @@ #include <device/pci_ids.h> #include "dmi.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -273,8 +273,9 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); /* Fix up global NVS region for SMI handler. The GNVS region lives * in the (high) table area. The low memory map looks like this: Modified: trunk/src/mainboard/technexion/tim5690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/technexion/tim5690/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,7 +57,7 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #define IO_APIC_ADDR 0xfec00000UL @@ -187,8 +187,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/technexion/tim8690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/technexion/tim8690/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -57,7 +57,7 @@ } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #define IO_APIC_ADDR 0xfec00000UL @@ -187,8 +187,9 @@ /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/tyan/s2891/acpi_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/tyan/s2891/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -20,7 +20,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -139,8 +139,9 @@ current = ALIGN(current, 16); dsdt = (acpi_header_t *) current; printk(BIOS_DEBUG, "ACPI: * DSDT %p\n", dsdt); - current += AmlCode.length; - memcpy((void*) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); current = ALIGN(current, 16); Modified: trunk/src/mainboard/tyan/s2892/acpi_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/tyan/s2892/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -20,7 +20,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -139,8 +139,9 @@ current = ALIGN(current, 16); dsdt = (acpi_header_t *) current; printk(BIOS_DEBUG, "ACPI: * DSDT %p\n", dsdt); - current += AmlCode.length; - memcpy((void*) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); current = ALIGN(current, 16); Modified: trunk/src/mainboard/tyan/s2895/acpi_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/tyan/s2895/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -20,7 +20,7 @@ #include <../../../northbridge/amd/amdk8/amdk8_acpi.h> #include <cpu/amd/model_fxx_powernow.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -164,8 +164,9 @@ current = ALIGN(current, 16); dsdt = (acpi_header_t *) current; printk(BIOS_DEBUG, "ACPI: * DSDT %p\n", dsdt); - current += AmlCode.length; - memcpy((void*) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); current = ALIGN(current, 16); Modified: trunk/src/mainboard/via/epia-m/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/epia-m/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/via/epia-m/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -11,7 +11,7 @@ #include <string.h> #include <arch/acpi.h> -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -75,10 +75,11 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *)current; - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); dsdt->checksum = 0; // don't trust intel iasl compiler to get this right - dsdt->checksum = acpi_checksum(dsdt,dsdt->length); + dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); printk(BIOS_DEBUG, "ACPI: * FADT\n"); Modified: trunk/src/mainboard/via/epia-m700/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/via/epia-m700/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -35,8 +35,8 @@ #include <device/pci_ids.h> #include <../../../northbridge/via/vx800/vx800.h> -extern const acpi_header_t AmlCode_dsdt; -extern const acpi_header_t AmlCode_ssdt; +extern const unsigned char AmlCode_dsdt[]; +extern const unsigned char AmlCode_ssdt[]; extern u32 wake_vec; @@ -80,8 +80,6 @@ unsigned long acpi_fill_madt(unsigned long current) { - unsigned int gsi_base = 0x18; - /* Create all subtables for processors. */ current = acpi_create_madt_lapics(current); @@ -113,6 +111,7 @@ unsigned long acpi_fill_srat(unsigned long current) { /* No NUMA, no SRAT. */ + return current; } #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) @@ -122,14 +121,15 @@ { unsigned long current; acpi_rsdp_t *rsdp; - acpi_srat_t *srat; acpi_rsdt_t *rsdt; - acpi_mcfg_t *mcfg; acpi_hpet_t *hpet; acpi_madt_t *madt; acpi_fadt_t *fadt; acpi_facs_t *facs; - acpi_header_t *dsdt, *ssdt; + acpi_header_t *dsdt; +#if 0 + acpi_header_t *ssdt; +#endif /* Align ACPI tables to 16 byte. */ start = (start + 0x0f) & -0x10; @@ -158,10 +158,11 @@ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - current += AmlCode_dsdt.length; - memcpy((void *)dsdt, &AmlCode_dsdt, AmlCode_dsdt.length); + memcpy(dsdt, &AmlCode_dsdt, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode_dsdt, dsdt->length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ - dsdt->checksum = acpi_checksum(dsdt, dsdt->length); + dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * FADT\n"); @@ -181,7 +182,7 @@ /* NO MCFG in VX855, no PCI-E. */ printk(BIOS_DEBUG, "ACPI: * HPET\n"); - hpet = (acpi_mcfg_t *) current; + hpet = (acpi_hpet_t *) current; acpi_create_hpet(hpet); current += hpet->header.length; acpi_add_table(rsdp, hpet); @@ -189,10 +190,11 @@ #if 0 printk(BIOS_DEBUG, "ACPI: * SSDT\n"); ssdt = (acpi_header_t *) current; - current += AmlCode_ssdt.length; - memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); + memcpy(ssdt, &AmlCode_ssdt, sizeof(acpi_header_t)); + current += ssdt->length; + memcpy(ssdt, &AmlCode_ssdt, ssdt->length); ssdt->checksum = 0; /* Don't trust iasl to get this right. */ - ssdt->checksum = acpi_checksum(ssdt, ssdt->length); + ssdt->checksum = acpi_checksum((u8*)ssdt, ssdt->length); acpi_add_table(rsdp, ssdt); printk(BIOS_DEBUG, "ACPI: * SSDT @ %08x Length %x\n", ssdt, ssdt->length); #endif Modified: trunk/src/mainboard/via/epia-n/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/epia-n/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/via/epia-n/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -35,7 +35,7 @@ #include <device/pci_ids.h> #include "../../../southbridge/via/vt8237r/vt8237r.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; /* * These four macros are copied from <arch/smp/mpspec.h>, I have to do this @@ -160,8 +160,9 @@ printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *)current; - current += AmlCode.length; - memcpy((void *)dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); #if 0 dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = acpi_checksum(dsdt,dsdt->length); Modified: trunk/src/mainboard/via/vt8454c/acpi_tables.c ============================================================================== --- trunk/src/mainboard/via/vt8454c/acpi_tables.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/mainboard/via/vt8454c/acpi_tables.c Fri Apr 9 05:41:23 2010 (r5384) @@ -27,7 +27,7 @@ #include <device/pci_ids.h> #include "dmi.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -180,8 +180,10 @@ acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode,AmlCode.length); + dsdt = (acpi_header_t *)current; + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); #ifdef DONT_TRUST_IASL dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = acpi_checksum(dsdt, dsdt->length); Modified: trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c ============================================================================== --- trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Thu Apr 8 23:04:45 2010 (r5383) +++ trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Fri Apr 9 05:41:23 2010 (r5384) @@ -268,7 +268,7 @@ } -void update_sspr(void *sspr, u32 nodeid, u32 cpuindex) +static void update_sspr(void *sspr, u32 nodeid, u32 cpuindex) { u8 *CPU; u8 *CPUIN; @@ -291,7 +291,7 @@ CONTROL = sspr + 0x8d; STATUS = sspr + 0x8f; - sprintf(CPU, "%02x", (u8)cpuindex); + sprintf(CPU, "%02x", (char)cpuindex); *CPUIN = (u8) cpuindex; for(i=0;i<sysconf.p_state_num;i++) { @@ -305,11 +305,11 @@ } } -extern const acpi_header_t AmlCode_sspr5; -extern const acpi_header_t AmlCode_sspr4; -extern const acpi_header_t AmlCode_sspr3; -extern const acpi_header_t AmlCode_sspr2; -extern const acpi_header_t AmlCode_sspr1; +extern const unsigned char AmlCode_sspr5[]; +extern const unsigned char AmlCode_sspr4[]; +extern const unsigned char AmlCode_sspr3[]; +extern const unsigned char AmlCode_sspr2[]; +extern const unsigned char AmlCode_sspr1[]; /* fixme: find one good way for different p_state_num */ unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current) @@ -321,7 +321,7 @@ if(!sysconf.p_state_num) return current; - acpi_header_t *AmlCode_sspr; + void *AmlCode_sspr; switch(sysconf.p_state_num) { case 1: AmlCode_sspr = &AmlCode_sspr1; break; case 2: AmlCode_sspr = &AmlCode_sspr2; break; @@ -342,8 +342,9 @@ current = ( current + 0x0f) & -0x10; ssdt = (acpi_header_t *)current; - current += AmlCode_sspr->length; - memcpy((void *)ssdt, AmlCode_sspr, AmlCode_sspr->length); + memcpy(ssdt, AmlCode_sspr, sizeof(acpi_header_t)); + current += ssdt->length; + memcpy(ssdt, AmlCode_sspr, ssdt->length); update_sspr((void*)ssdt,cpu->path.apic.node_id, cpu_index); /* recalculate checksum */ ssdt->checksum = 0;

1 0

P2B-LS status for wiki
by Keith Hui 08 Apr '10

08 Apr '10

Hi all, As title. Can someone enter this into the wiki? CPU status same as P2B-F RAM status EDO: untested SDRAM: OK ECC support: WIP - Not yet supported by the coreboot 440BX code, but it's on our TODO list. On-board hardware On-board IDE 3.5": Secondary IDE works. There are some problems with primary IDE. On-board SCSI: WIP - Detected, but not properly enabled. On-board ethernet: OK - Works only when not listed in the mainboard's device tree. Add-on slots ISA add-on cards: OK - Tested with Sound Blaster AWE64 ISA. Detected, initialized, ALSA driver loaded, no sound PCI add-on cards: OK - Tested with a PCI NE2000 NIC in one slot PCI-X add-on cards: N/A PCIe add-on cards: N/A Legacy/Super I/O Sensors/fan control: OK SMBus: OK Nonstandard LEDs: Untested - Message LED requires ACPI and OS support Wake on ...: Untested ACPI/reboot/suspend/poweroff: All untested; there is still not ACPI support for this board. flashrom: OK Known working build: r5238 introduced full SDRAM support. Most later builds should work. Board has socketed ROM chip Board not supported by flashrom (yet); works when forced as P2B-F with coreboot. Not tested with vendor BIOS. Chip is SST39SF020A. I flashed 3 times in a row. No problems. Thanks Keith

2 1

[commit] r5383 - in trunk: . src/arch/i386 src/arch/i386/init
by repository service 08 Apr '10

08 Apr '10

Author: oxygene Date: Thu Apr 8 23:04:45 2010 New Revision: 5383 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5383 Log: Split crt0.S.lb into prologue and epilogue (the latter only for romcc), rename crt0_includes.h to crt0.S, and compile that directly. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Added: trunk/src/arch/i386/init/crt0_prologue.inc - copied, changed from r5378, trunk/src/arch/i386/init/crt0.S.lb trunk/src/arch/i386/init/crt0_romcc_epilogue.inc - copied, changed from r5378, trunk/src/arch/i386/init/crt0.S.lb Deleted: trunk/src/arch/i386/init/crt0.S.lb Modified: trunk/Makefile trunk/src/arch/i386/Makefile.bigbootblock.inc trunk/src/arch/i386/Makefile.bootblock.inc trunk/src/arch/i386/Makefile.inc Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Apr 8 17:12:18 2010 (r5382) +++ trunk/Makefile Thu Apr 8 23:04:45 2010 (r5383) @@ -320,7 +320,7 @@ rm -f $(DEPENDENCIES) rm -f $(obj)/coreboot_ram* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a rm -rf $(obj)/bootblock* $(obj)/romstage* $(obj)/location.* - rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript + rm -f $(obj)/option_table.* $(obj)/crt0.S $(obj)/ldscript rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot rm -f $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm rm -f $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc Modified: trunk/src/arch/i386/Makefile.bigbootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bigbootblock.inc Thu Apr 8 17:12:18 2010 (r5382) +++ trunk/src/arch/i386/Makefile.bigbootblock.inc Thu Apr 8 23:04:45 2010 (r5383) @@ -16,7 +16,7 @@ printf 'INCLUDE "ldoptions"\n' > $@ printf '$(foreach ldscript,$(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' >> $@ -$(obj)/crt0_includes.h: $$(crt0s) +$(obj)/crt0.S: $$(crt0s) @printf " GEN $(subst $(obj)/,,$(@))\n" printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ @@ -24,7 +24,7 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD -I$(obj) -Wa,-acdlns -c -o $@ $< > $(dir $(a))/crt0.disasm -$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(src)/arch/i386/init/crt0.S.lb $(obj)/crt0_includes.h +$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/crt0.S @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@ Modified: trunk/src/arch/i386/Makefile.bootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bootblock.inc Thu Apr 8 17:12:18 2010 (r5382) +++ trunk/src/arch/i386/Makefile.bootblock.inc Thu Apr 8 23:04:45 2010 (r5383) @@ -96,7 +96,7 @@ mkdir -p $(obj)/romstage printf '$(foreach ldscript,ldoptions location.ld $(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' > $@ -$(obj)/romstage/crt0_includes.h: $$(crt0s) +$(obj)/romstage/crt0.S: $$(crt0s) @printf " GEN $(subst $(obj)/,,$(@))\n" mkdir -p $(obj)/romstage printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ @@ -105,7 +105,7 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -I$(obj) -Wa,-acdlns -c -o $@ $< > $(dir $(a))/crt0.disasm -$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(src)/arch/i386/init/crt0.S.lb $(obj)/romstage/crt0_includes.h +$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/romstage/crt0.S @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/romstage -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@ Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Thu Apr 8 17:12:18 2010 (r5382) +++ trunk/src/arch/i386/Makefile.inc Thu Apr 8 23:04:45 2010 (r5383) @@ -100,7 +100,7 @@ ####################################################################### # done -crt0s = +crt0s = $(src)/arch/i386/init/crt0_prologue.inc ldscripts = ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb ifeq ($(CONFIG_BIG_BOOTBLOCK),y) @@ -196,6 +196,10 @@ ldscripts += $(chipset_bootblock_lds) endif +ifeq ($(CONFIG_ROMCC),y) +crt0s += $(src)/arch/i386/init/crt0_romcc_epilogue.inc +endif + OPTION_TABLE_H:= ifeq ($(CONFIG_HAVE_OPTION_TABLE),y) OPTION_TABLE_H:=$(obj)/option_table.h Copied and modified: trunk/src/arch/i386/init/crt0_prologue.inc (from r5378, trunk/src/arch/i386/init/crt0.S.lb) ============================================================================== --- trunk/src/arch/i386/init/crt0.S.lb Thu Apr 8 15:16:32 2010 (r5378, copy source) +++ trunk/src/arch/i386/init/crt0_prologue.inc Thu Apr 8 23:04:45 2010 (r5383) @@ -1,23 +1,10 @@ -/* -*- asm -*- - * $ $ - * - */ - /* - * Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer + * Copyright 2002 Eric Biederman * * This file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. - * - * Originally this code was part of ucl the data compression library - * for upx the ``Ultimate Packer of eXecutables''. - * - * - Converted to gas assembly, and refitted to work with etherboot. - * Eric Biederman 20 Aug 2002 - * - Merged the nrv2b decompressor into crt0.base of coreboot - * Eric Biederman 26 Sept 2002 */ @@ -39,109 +26,3 @@ post_code(0x01) /* delay for chipsets */ -#include "crt0_includes.h" - -#if CONFIG_USE_DCACHE_RAM == 0 -#ifndef CONSOLE_DEBUG_TX_STRING - /* uses: esp, ebx, ax, dx */ -# define __CRT_CONSOLE_TX_STRING(string) \ - mov string, %ebx ; \ - CALLSP(crt_console_tx_string) - -# if defined(CONFIG_TTYS0_BASE) && (ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG) -# define CONSOLE_DEBUG_TX_STRING(string) __CRT_CONSOLE_TX_STRING(string) -# else -# define CONSOLE_DEBUG_TX_STRING(string) -# endif -#endif - - /* clear boot_complete flag */ - xorl %ebp, %ebp -__main: - CONSOLE_DEBUG_TX_STRING($str_copying_to_ram) - - /* - * Copy data into RAM and clear the BSS. Since these segments - * isn\'t really that big we just copy/clear using bytes, not - * double words. - */ - post_code(0x11) /* post 11 */ - - cld /* clear direction flag */ - - /* copy coreboot from it's initial load location to - * the location it is compiled to run at. - * Normally this is copying from FLASH ROM to RAM. - */ - movl %ebp, %esi - /* FIXME: look for a proper place for the stack */ - movl $0x4000000, %esp - movl %esp, %ebp - pushl %esi - pushl $str_coreboot_ram_name - call cbfs_and_run_core - -.Lhlt: - post_code(0xee) /* post fe */ - hlt - jmp .Lhlt - -#ifdef __CRT_CONSOLE_TX_STRING - /* Uses esp, ebx, ax, dx */ -crt_console_tx_string: - mov (%ebx), %al - inc %ebx - cmp $0, %al - jne 9f - RETSP -9: -/* Base Address */ -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3f8 -#endif -/* Data */ -#define TTYS0_RBR (CONFIG_TTYS0_BASE+0x00) - -/* Control */ -#define TTYS0_TBR TTYS0_RBR -#define TTYS0_IER (CONFIG_TTYS0_BASE+0x01) -#define TTYS0_IIR (CONFIG_TTYS0_BASE+0x02) -#define TTYS0_FCR TTYS0_IIR -#define TTYS0_LCR (CONFIG_TTYS0_BASE+0x03) -#define TTYS0_MCR (CONFIG_TTYS0_BASE+0x04) -#define TTYS0_DLL TTYS0_RBR -#define TTYS0_DLM TTYS0_IER - -/* Status */ -#define TTYS0_LSR (CONFIG_TTYS0_BASE+0x05) -#define TTYS0_MSR (CONFIG_TTYS0_BASE+0x06) -#define TTYS0_SCR (CONFIG_TTYS0_BASE+0x07) - - mov %al, %ah -10: mov $TTYS0_LSR, %dx - inb %dx, %al - test $0x20, %al - je 10b - mov $TTYS0_TBR, %dx - mov %ah, %al - outb %al, %dx - - jmp crt_console_tx_string -#endif /* __CRT_CONSOLE_TX_STRING */ - -#if defined(CONSOLE_DEBUG_TX_STRING) && (ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG) -.section ".rom.data" -#if CONFIG_COMPRESS -str_copying_to_ram: .string "Uncompressing coreboot to RAM.\r\n" -#else -str_copying_to_ram: .string "Copying coreboot to RAM.\r\n" -#endif -str_pre_main: .string "Jumping to coreboot.\r\n" -.previous - -#endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */ - -str_coreboot_ram_name: .ascii CONFIG_CBFS_PREFIX - .string "/coreboot_ram" - -#endif /* CONFIG_USE_DCACHE_RAM */ Copied and modified: trunk/src/arch/i386/init/crt0_romcc_epilogue.inc (from r5378, trunk/src/arch/i386/init/crt0.S.lb) ============================================================================== --- trunk/src/arch/i386/init/crt0.S.lb Thu Apr 8 15:16:32 2010 (r5378, copy source) +++ trunk/src/arch/i386/init/crt0_romcc_epilogue.inc Thu Apr 8 23:04:45 2010 (r5383) @@ -21,27 +21,6 @@ */ -#include <arch/asm.h> -#include <arch/intel.h> -#include <console/loglevel.h> - -#ifndef ASM_CONSOLE_LOGLEVEL -#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL -#endif - -/* - * This is the entry code the code in .reset section - * jumps to this address. - * - */ -.section ".rom.data", "a", @progbits -.section ".rom.text", "ax", @progbits - - post_code(0x01) /* delay for chipsets */ - -#include "crt0_includes.h" - -#if CONFIG_USE_DCACHE_RAM == 0 #ifndef CONSOLE_DEBUG_TX_STRING /* uses: esp, ebx, ax, dx */ # define __CRT_CONSOLE_TX_STRING(string) \ @@ -143,5 +122,3 @@ str_coreboot_ram_name: .ascii CONFIG_CBFS_PREFIX .string "/coreboot_ram" - -#endif /* CONFIG_USE_DCACHE_RAM */

1 0

[PATCH]refactor crt0.S.lb
by Patrick Georgi 08 Apr '10

08 Apr '10

(retry, the first attempt seems to have been eaten by the list daemon) Hi, attached patch splits crt0.S.lb, adds the first part of it as first element of crt0s, adds the second part as last element of crt0s on romcc boards (it was guarded with #if CONFIG_USE_DCACHE_RAM==0), renames crt0_includes.h to crt0.S and runs this, instead of crt0.S.lb through the assembler. Minor clean up, but I hope it's clearer what's loaded when with this change. It passes abuild. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

2 1

← Newer
1
...
30
31
32
33
34
35
36
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot April 2010