diff options
Diffstat (limited to 'src/mainboard/google/gru')
| -rw-r--r-- | src/mainboard/google/gru/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/gru/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/google/gru/chromeos.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/gru/chromeos.fmd | 2 | ||||
| -rw-r--r-- | src/mainboard/google/gru/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/google/gru/romstage.c | 34 |
6 files changed, 2 insertions, 45 deletions
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index c225d101e1..6f234ad332 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -41,6 +41,7 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER string + default "Kevin" if BOARD_GOOGLE_KEVIN default "Gru" config MAINBOARD_VENDOR diff --git a/src/mainboard/google/gru/Makefile.inc b/src/mainboard/google/gru/Makefile.inc index 752830c4cc..879520c95b 100644 --- a/src/mainboard/google/gru/Makefile.inc +++ b/src/mainboard/google/gru/Makefile.inc @@ -29,7 +29,6 @@ romstage-y += boardid.c romstage-y += chromeos.c romstage-y += memlayout.ld romstage-y += reset.c -romstage-y += romstage.c ramstage-y += boardid.c ramstage-y += chromeos.c diff --git a/src/mainboard/google/gru/chromeos.c b/src/mainboard/google/gru/chromeos.c index 6f9380d33c..da57d861c6 100644 --- a/src/mainboard/google/gru/chromeos.c +++ b/src/mainboard/google/gru/chromeos.c @@ -15,10 +15,6 @@ */ #include <boot/coreboot_tables.h> -#include <console/console.h> -#include <ec/google/chromeec/ec.h> -#include <ec/google/chromeec/ec_commands.h> -#include <string.h> #include <vendorcode/google/chromeos/chromeos.h> void fill_lb_gpios(struct lb_gpios *gpios) diff --git a/src/mainboard/google/gru/chromeos.fmd b/src/mainboard/google/gru/chromeos.fmd index c3811707a8..bf30ddff29 100644 --- a/src/mainboard/google/gru/chromeos.fmd +++ b/src/mainboard/google/gru/chromeos.fmd @@ -25,5 +25,5 @@ FLASH@0x0 0x800000 { SHARED_DATA@0x0 0x10000 } RW_NVRAM@0x5f0000 0x10000 - RW_LEGACY@0x600000 0x200000 + RW_LEGACY(CBFS)@0x600000 0x200000 } diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c index 1641838a5a..649f16296c 100644 --- a/src/mainboard/google/gru/mainboard.c +++ b/src/mainboard/google/gru/mainboard.c @@ -14,12 +14,7 @@ * */ -#include <arch/cache.h> -#include <arch/io.h> -#include <boardid.h> -#include <boot/coreboot_tables.h> #include <device/device.h> -#include <console/console.h> static void mainboard_init(device_t dev) { diff --git a/src/mainboard/google/gru/romstage.c b/src/mainboard/google/gru/romstage.c deleted file mode 100644 index 4786937acc..0000000000 --- a/src/mainboard/google/gru/romstage.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2016 Rockchip Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#include <arch/cache.h> -#include <arch/cpu.h> -#include <arch/exception.h> -#include <arch/io.h> -#include <cbfs.h> -#include <console/console.h> -#include <delay.h> -#include <program_loading.h> -#include <romstage_handoff.h> -#include <symbols.h> - -void main(void) -{ - console_init(); - exception_init(); - cbmem_initialize_empty(); - run_ramstage(); -} |