rpi: add Raspberry Pi 3 board ID

[u-boot] / board / sandbox / sandbox.c

diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 80eaa6334cb56cccbeadaee9e0a3bf68c9a07c40..b41e9decb306b0e5d05d57f14e51ccfb43b7533f 100644 (file)
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -26,6 +26,7 @@ void flush_cache(unsigned long start, unsigned long size)
 {
 }
 
+#ifndef CONFIG_TIMER
 /* system timer offset in ms */
 static unsigned long sandbox_timer_offset;
 
@@ -38,6 +39,7 @@ unsigned long timer_read_counter(void)
 {
        return os_get_nsec() / 1000 + sandbox_timer_offset * 1000;
 }
+#endif
 
 int dram_init(void)
 {
@@ -45,23 +47,6 @@ int dram_init(void)
        return 0;
 }
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-#ifdef CONFIG_VIDEO_SANDBOX_SDL
-       int ret;
-
-       ret = sandbox_lcd_sdl_early_init();
-       if (ret) {
-               puts("Could not init sandbox LCD emulation\n");
-               return ret;
-       }
-#endif
-
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {