From 88b21f31e61c2527b05623a2ebbbd150531d7657 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Fri, 4 Sep 2015 10:24:40 -0700 Subject: kunimitsu: Select BOARD_ID_AUTO and clean up boardid code Select the BOARD_ID_AUTO kconfig option to have the coreboot tables populated with the board ID and print it early in romstage as well. Also clean up the code for it. BUG=chrome-os-partner:40635 BRANCH=none TEST=emerge-kunimitsu coreboot Change-Id: I90bd85ef14543717287cbeaaab77e6c54b94df97 Signed-off-by: Patrick Georgi Original-Commit-Id: 1fed7de4a0650a497a240b091fd2eb99d59e1433 Original-Change-Id: I82e9d17ab618b1aae1fd874d9247b7d52b42334d Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://chromium-review.googlesource.com/297750 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11574 Reviewed-by: Alexandru Gagniuc Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/intel/kunimitsu/Kconfig | 1 + src/mainboard/intel/kunimitsu/Makefile.inc | 7 +++++-- src/mainboard/intel/kunimitsu/boardid.c | 6 ++---- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index bc8ab3ea34..dd9e455925 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -2,6 +2,7 @@ if BOARD_INTEL_KUNIMITSU config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select EC_GOOGLE_CHROMEEC diff --git a/src/mainboard/intel/kunimitsu/Makefile.inc b/src/mainboard/intel/kunimitsu/Makefile.inc index 522308f9aa..61fdc7bb9d 100644 --- a/src/mainboard/intel/kunimitsu/Makefile.inc +++ b/src/mainboard/intel/kunimitsu/Makefile.inc @@ -20,14 +20,17 @@ subdirs-y += spd +romstage-y += boardid.c romstage-y += pei_data.c romstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c + ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c + +ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += pei_data.c ramstage-y += ramstage.c -ramstage-y += boardid.c -romstage-y += boardid.c + smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/intel/kunimitsu/boardid.c b/src/mainboard/intel/kunimitsu/boardid.c index 58da22e3f5..59c6fff3b6 100644 --- a/src/mainboard/intel/kunimitsu/boardid.c +++ b/src/mainboard/intel/kunimitsu/boardid.c @@ -1,8 +1,8 @@ /* * This file is part of the coreboot project. * - * Copyright(C) 2013 Google Inc. - * Copyright (C) 2015 Intel Corp. + * Copyright (C) 2015 Google Inc. + * Copyright (C) 2015 Intel Corporation * * 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 @@ -21,7 +21,6 @@ #include #include - uint8_t board_id(void) { MAYBE_STATIC int id = -1; @@ -31,4 +30,3 @@ uint8_t board_id(void) return id; } - -- cgit v1.2.3