common: Drop linux/bitops.h from common header

[platform/kernel/u-boot.git] / arch / arm / mach-rockchip / tpl.c

diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index 55f6e92..88f80b0 100644 (file)
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -6,11 +6,15 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
+#include <hang.h>
+#include <init.h>
+#include <log.h>
 #include <ram.h>
 #include <spl.h>
 #include <version.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
+#include <linux/bitops.h>
 
 #define TIMER_LOAD_COUNT_L     0x00
 #define TIMER_LOAD_COUNT_H     0x04
@@ -39,11 +43,18 @@ __weak void rockchip_stimer_init(void)
               TIMER_CONTROL_REG);
 }
 
+__weak int board_early_init_f(void)
+{
+       return 0;
+}
+
 void board_init_f(ulong dummy)
 {
        struct udevice *dev;
        int ret;
 
+       board_early_init_f();
+
 #if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT)
        /*
         * Debug UART can be used from here if required:
@@ -77,9 +88,12 @@ void board_init_f(ulong dummy)
        }
 }
 
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+                           struct spl_boot_device *bootdev)
 {
        back_to_bootrom(BROM_BOOT_NEXTSTAGE);
+
+       return 0;
 }
 
 u32 spl_boot_device(void)