x86: Add some missing global_data declarations in files that use gd

[oweals/u-boot.git] / arch / x86 / cpu / coreboot / coreboot.c

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 6d06d5af19e5f7f38ce19676f97a0ac25d1803cc..0e9f15fef68a7eec36421645e2af511280cd05fb 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -7,16 +7,11 @@
  */
 
 #include <common.h>
-#include <asm/u-boot-x86.h>
-#include <flash.h>
+#include <fdtdec.h>
 #include <netdev.h>
-#include <ns16550.h>
-#include <asm/msr.h>
-#include <asm/cache.h>
-#include <asm/cpu.h>
 #include <asm/io.h>
+#include <asm/msr.h>
 #include <asm/mtrr.h>
-#include <asm/arch/tables.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/arch/timestamp.h>
 
@@ -53,13 +48,6 @@ int last_stage_init(void)
        return 0;
 }
 
-#ifndef CONFIG_SYS_NO_FLASH
-ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
-{
-       return 0;
-}
-#endif
-
 int board_eth_init(bd_t *bis)
 {
        return pci_eth_init(bis);
@@ -67,7 +55,8 @@ int board_eth_init(bd_t *bis)
 
 void board_final_cleanup(void)
 {
-       /* Un-cache the ROM so the kernel has one
+       /*
+        * Un-cache the ROM so the kernel has one
         * more MTRR available.
         *
         * Coreboot should have assigned this to the
@@ -86,16 +75,22 @@ void board_final_cleanup(void)
                mtrr_close(&state);
        }
 
-       /* Issue SMI to Coreboot to lock down ME and registers */
-       printf("Finalizing Coreboot\n");
-       outb(0xcb, 0xb2);
+       if (!fdtdec_get_config_bool(gd->fdt_blob, "u-boot,no-apm-finalize")) {
+               /*
+                * Issue SMI to coreboot to lock down ME and registers
+                * when allowed via device tree
+                */
+               printf("Finalizing coreboot\n");
+               outb(0xcb, 0xb2);
+       }
 }
 
-void panic_puts(const char *str)
+int misc_init_r(void)
 {
-       NS16550_t port = (NS16550_t)0x3f8;
+       return 0;
+}
 
-       NS16550_init(port, 1);
-       while (*str)
-               NS16550_putc(port, *str++);
+int arch_misc_init(void)
+{
+       return 0;
 }