From c6eb9458e82cb47afa8f20e21a4cac5211eab557 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 14 May 2014 12:54:37 +0900 Subject: Revert "sandbox: move source files from board/ to arch/sandbox/" This reverts commit 258060905e04fe2eb509756ef3b37e23e220a2d6. Conflicts: boards.cfg Wrong patch 25806090 was applied by accident. Revert it. Signed-off-by: Masahiro Yamada Cc: Simon Glass Acked-by: Simon Glass --- arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/sandbox.c | 83 ---------------------------------------------- 2 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 arch/sandbox/lib/sandbox.c (limited to 'arch/sandbox') diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index 6480ebfca67..4c1a38d6bcb 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -8,4 +8,4 @@ # -obj-y += interrupts.o sandbox.o +obj-y += interrupts.o diff --git a/arch/sandbox/lib/sandbox.c b/arch/sandbox/lib/sandbox.c deleted file mode 100644 index e4d4e021bcd..00000000000 --- a/arch/sandbox/lib/sandbox.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2011 The Chromium OS Authors. - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include - -/* - * Pointer to initial global data area - * - * Here we initialize it. - */ -gd_t *gd; - -/* Add a simple GPIO device */ -U_BOOT_DEVICE(gpio_sandbox) = { - .name = "gpio_sandbox", -}; - -void flush_cache(unsigned long start, unsigned long size) -{ -} - -unsigned long timer_read_counter(void) -{ - return os_get_nsec() / 1000; -} - -int dram_init(void) -{ - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; - 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 - -int arch_early_init_r(void) -{ -#ifdef CONFIG_CROS_EC - if (cros_ec_board_init()) { - printf("%s: Failed to init EC\n", __func__); - return 0; - } -#endif - - return 0; -} - -#ifdef CONFIG_BOARD_LATE_INIT -int board_late_init(void) -{ - if (cros_ec_get_error()) { - /* Force console on */ - gd->flags &= ~GD_FLG_SILENT; - - printf("cros-ec communications failure %d\n", - cros_ec_get_error()); - puts("\nPlease reset with Power+Refresh\n\n"); - panic("Cannot init cros-ec device"); - return -1; - } - return 0; -} -#endif -- cgit v1.2.3