diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2014-07-23 18:32:01 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-03-13 23:01:54 +0100 |
| commit | f9fb0d9bf3944e643e76ea9336565e28cef30547 (patch) | |
| tree | 17ca53a5041ff8cb29ecd67575544928fcd8c402 /src/mainboard/google/nyan | |
| parent | 419fa61f370072d82c037f84d8f89d0c4c23480b (diff) | |
Use a common boardid.h instead of per board copies
There is no point in duplicating boardid.h per board - they are all
the same. Let's keep a single instance in the common include directory
and let the linker report a problem if one tries using this function
on a board where it is not supported.
BUG=chrome-os-partner:30489
TEST=verified that coreboot builds fine for nyan_big and nyan_blaze.
Original-Change-Id: Ifbe9c2287a1d828d4db74c637d1d02047ac4da25
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/209699
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
(cherry picked from commit 589e6415faf18ca6aaf44da343dd33eadc8a53d3)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I8eef89cb822611a0050e5a50fc4b970eebd8d962
Reviewed-on: http://review.coreboot.org/8666
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google/nyan')
| -rw-r--r-- | src/mainboard/google/nyan/boardid.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/boardid.h | 27 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/pmic.c | 2 |
3 files changed, 2 insertions, 29 deletions
diff --git a/src/mainboard/google/nyan/boardid.c b/src/mainboard/google/nyan/boardid.c index 18d920b6f5..a5ec61fa64 100644 --- a/src/mainboard/google/nyan/boardid.c +++ b/src/mainboard/google/nyan/boardid.c @@ -20,7 +20,7 @@ #include <console/console.h> #include <soc/nvidia/tegra124/gpio.h> -#include "boardid.h" +#include <boardid.h> uint8_t board_id(void) { diff --git a/src/mainboard/google/nyan/boardid.h b/src/mainboard/google/nyan/boardid.h deleted file mode 100644 index b65f54337e..0000000000 --- a/src/mainboard/google/nyan/boardid.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2013 Google 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __MAINBOARD_GOOGLE_NYAN_BOARDID_H__ -#define __MAINBOARD_GOOGLE_NYAN_BOARDID_H__ - -#include <stdint.h> - -uint8_t board_id(void); - -#endif /* __MAINBOARD_GOOGLE_NYAN_BOARDID_H__ */ diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c index dc5f7447a6..2a65719fab 100644 --- a/src/mainboard/google/nyan/pmic.c +++ b/src/mainboard/google/nyan/pmic.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> -#include "boardid.h" +#include <boardid.h> #include "pmic.h" #include "reset.h" |