SPDX: Convert all of our single license tags to Linux Kernel style

[oweals/u-boot.git] / arch / x86 / lib / spl.c

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 2b1b450737b1a53e65c93af0f7080d080acbfb57..7d290740bfa873bdb45176e7232bdd729e72a87e 100644 (file)
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:     GPL-2.0
  */
 
 #include <common.h>
 #include <debug_uart.h>
-#include <init_helpers.h>
 #include <spl.h>
 #include <asm/cpu.h>
 #include <asm/mtrr.h>
@@ -37,8 +35,6 @@ static int x86_spl_init(void)
                debug("%s: spl_init() failed\n", __func__);
                return ret;
        }
-       preloader_console_init();
-
        ret = arch_cpu_init();
        if (ret) {
                debug("%s: arch_cpu_init() failed\n", __func__);
@@ -49,6 +45,7 @@ static int x86_spl_init(void)
                debug("%s: arch_cpu_init_dm() failed\n", __func__);
                return ret;
        }
+       preloader_console_init();
        ret = print_cpuinfo();
        if (ret) {
                debug("%s: print_cpuinfo() failed\n", __func__);