Merge git://www.denx.de/git/u-boot-marvell

[oweals/u-boot.git] / arch / arm / mach-uniphier / board_init.c

diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index e05d6bffd5ce3f5fd55873e6cdfaf61db95146d0..ed58d07f7e502e44d54420216d1040b383557d81 100644 (file)
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -21,7 +21,7 @@ static void uniphier_setup_xirq(void)
 {
        const void *fdt = gd->fdt_blob;
        int soc_node, aidet_node;
-       const u32 *val;
+       const fdt32_t *val;
        unsigned long aidet_base;
        u32 tmp;
 
@@ -73,9 +73,6 @@ static void uniphier_ld20_misc_init(void)
                writel(0x0000b500, 0x6184e024);
                writel(0x00000001, 0x6184e000);
        }
-#ifdef CONFIG_ARMV8_MULTIENTRY
-       cci500_init(2);
-#endif
 }
 #endif
 
@@ -89,15 +86,6 @@ struct uniphier_initdata {
 };
 
 static const struct uniphier_initdata uniphier_initdata[] = {
-#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-       {
-               .soc_id = UNIPHIER_SLD3_ID,
-               .nand_2cs = true,
-               .sbc_init = uniphier_sbc_init_admulti,
-               .pll_init = uniphier_sld3_pll_init,
-               .clk_init = uniphier_ld4_clk_init,
-       },
-#endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
        {
                .soc_id = UNIPHIER_LD4_ID,
@@ -230,12 +218,6 @@ int board_init(void)
 
        support_card_late_init();
 
-       led_puts("U6");
-
-#ifdef CONFIG_ARMV8_MULTIENTRY
-       uniphier_smp_kick_all_cpus();
-#endif
-
        led_puts("Uboo");
 
        return 0;