[coreboot] r4315, CBFS, supermicro H8DME -> boom

[Carl-Daniel Hailfinger]

On 19.06.2009 16:21, Ward Vandewege wrote:
> I tracked this down to r4315. Here's a boot log with r4315:
> And here's r4314, which works:
>
> So, if anyone has thoughts on what might be causing this, they would be very
> welcome :)
>   

Index: src/arch/i386/init/crt0.S.lb
===================================================================
--- src/arch/i386/init/crt0.S.lb        (revision 4314)
+++ src/arch/i386/init/crt0.S.lb        (revision 4315)
@@ -73,6 +73,10 @@
        movl    $0x4000000, %esp
        movl    %esp, %ebp
        pushl %esi
+#ifdef CONFIG_CBFS
+       pushl $str_coreboot_ram_name
+       call cbfs_and_run_core
+#else
        movl    $_liseg, %esi
        movl    $_iseg,  %edi
        movl    $_eiseg, %ecx
@@ -81,6 +85,7 @@
        pushl %edi
        pushl %esi
        call copy_and_run_core
+#endif


Erm. Shouldn't that be #if instead of #ifdef?

Regards,
Carl-Daniel

-- 
http://www.hailfinger.org/