armv8: LS2080A: Consolidate LS2080A and LS2085A

[u-boot] / arch / arm / cpu / armv8 / fsl-layerscape / spl.c

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index ba551aaa6e89ddfc048fdddab3ff93115797af17..c1229c88af135f8cb465123719e07b5d4a4b353c 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -44,11 +44,9 @@ u32 spl_boot_mode(void)
 #ifdef CONFIG_SPL_BUILD
 void board_init_f(ulong dummy)
 {
-       /* Set global data pointer */
-       gd = &gdata;
        /* Clear global data */
        memset((void *)gd, 0, sizeof(gd_t));
-#ifdef CONFIG_LS2085A
+#ifdef CONFIG_LS2080A
        arch_cpu_init();
 #endif
 #ifdef CONFIG_FSL_IFC
@@ -56,7 +54,7 @@ void board_init_f(ulong dummy)
 #endif
        board_early_init_f();
        timer_init();
-#ifdef CONFIG_LS2085A
+#ifdef CONFIG_LS2080A
        env_init();
 #endif
        get_clocks();