Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / mainboard / digitallogic / msm800sev / romstage.c

diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c
index be696d97d4cf1bc36aa08fca3ec6260edd8b02fb..379f5517bcb30092cf588a67e6b24ce755ee6c12 100644 (file)
--- a/src/mainboard/digitallogic/msm800sev/romstage.c
+++ b/src/mainboard/digitallogic/msm800sev/romstage.c
@@ -35,30 +35,14 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"
 #include "cpu/amd/model_lx/cpureginit.c"
 #include "cpu/amd/model_lx/syspreinit.c"
-
-static void msr_init(void)
-{
-       msr_t msr;
-       /* Setup access to the MC for under 1MB. Note MC not setup yet. */
-       msr.hi = 0x24fffc02;
-       msr.lo =  0x10010000;
-       wrmsr(CPU_RCONF_DEFAULT, msr);
-
-       msr.hi = 0x20000000;
-       msr.lo = 0xfff00;
-       wrmsr(MSR_GLIU0 + 0x20, msr);
-
-       msr.hi = 0x20000000;
-       msr.lo =  0xfff00;
-       wrmsr(MSR_GLIU1 + 0x20, msr);
-}
+#include "cpu/amd/model_lx/msrinit.c"
 
 static void mb_gpio_init(void)
 {
        /* Early mainboard specific GPIO setup */
 }
 
-void cache_as_ram_main(void)
+void main(unsigned long bist)
 {
        post_code(0x01);
 
@@ -81,6 +65,9 @@ void cache_as_ram_main(void)
        uart_init();
        console_init();
 
+       /* Halt if there was a built in self test failure */
+       report_bist_failure(bist);
+
        pll_reset(ManualConf);
 
        cpuRegInit();
@@ -106,7 +93,7 @@ void cache_as_ram_main(void)
        print_err("POST 02\n");
        __asm__("wbinvd\n");
        print_err("Past wbinvd\n");
-       /* we are finding the return does not work on this board. Explicitly call the label that is 
+       /* we are finding the return does not work on this board. Explicitly call the label that is
         * after the call to us. This is gross, but sometimes at this level it is the only way out
         */
        void done_cache_as_ram_main(void);