m5a99x-evo: raminit not ok? :-/

diff --git a/src/mainboard/asus/m5a99x-evo/romstage.c b/src/mainboard/asus/m5a99x-evo/romstage.c
index 3f4ad35205fb78e2dbc92530acf4893610b46802..424c9a97c69371dbabefa6d6ef93b69816b00e45 100644 (file)
--- a/src/mainboard/asus/m5a99x-evo/romstage.c
+++ b/src/mainboard/asus/m5a99x-evo/romstage.c
@@ -114,14 +114,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        uart_init();
        console_init();
        printk(BIOS_DEBUG, "\n");
-       printk(BIOS_DEBUG, "zomg1\n");
-       sr56x0_rd890_disable_pcie_bridge();
-
-       printk(BIOS_DEBUG, "zomg2\n");
-       nb_Poweron_Init();
-       printk(BIOS_DEBUG, "zomg3\n");
-       nb_Ht_Init();
-       printk(BIOS_DEBUG, "zomg4\n");
 
 
 //     dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
@@ -175,10 +167,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        post_code(0x38);
 
-       /* run _early_setup before soft-reset. */
-#if 0
-       rs780_early_setup();
-#endif
+       sr56x0_rd890_disable_pcie_bridge();
+       nb_Poweron_Init();
 
 #if CONFIG_SET_FIDVID == 1
        msr = rdmsr(0xc0010071);
@@ -198,9 +188,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        printk(BIOS_DEBUG, "End FIDVIDMSR 0xc0010071 0x%08x 0x%08x \n", msr.hi, msr.lo);
 #endif
 
-#if 0
-       rs780_htinit();
-#endif
+       nb_Ht_Init();
 
        /* Reset for HT, FIDVID, PLL and errata changes to take affect. */
        if (!warm_reset_detect(0)) {