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>
This commit is contained in:
parent
419fa61f37
commit
f9fb0d9bf3
|
@ -17,11 +17,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __MAINBOARD_GOOGLE_RUSH_BOARDID_H__
|
||||
#define __MAINBOARD_GOOGLE_RUSH_BOARDID_H__
|
||||
#ifndef __INCLUDE_BOARDID_H__
|
||||
#define __INCLUDE_BOARDID_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
uint8_t board_id(void);
|
||||
|
||||
#endif /* __MAINBOARD_GOOGLE_RUSH_BOARDID_H__ */
|
||||
#endif /* __INCLUDE_BOARDID_H__ */
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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__ */
|
|
@ -24,7 +24,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
#include "pmic.h"
|
||||
#include "reset.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <soc/nvidia/tegra124/gpio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
|
||||
uint8_t board_id(void)
|
||||
{
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright 2014 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_BIG_BOARDID_H__
|
||||
#define __MAINBOARD_GOOGLE_NYAN_BIG_BOARDID_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
uint8_t board_id(void);
|
||||
|
||||
#endif /* __MAINBOARD_GOOGLE_NYAN_BIG_BOARDID_H__ */
|
|
@ -24,7 +24,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
#include "pmic.h"
|
||||
#include "reset.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <soc/nvidia/tegra124/gpio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
|
||||
uint8_t board_id(void)
|
||||
{
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright 2014 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_BLAZE_BOARDID_H__
|
||||
#define __MAINBOARD_GOOGLE_NYAN_BLAZE_BOARDID_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
uint8_t board_id(void);
|
||||
|
||||
#endif /* __MAINBOARD_GOOGLE_NYAN_BLAZE_BOARDID_H__ */
|
|
@ -24,7 +24,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
#include "pmic.h"
|
||||
#include "reset.h"
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <console/console.h>
|
||||
#include <soc/nvidia/tegra132/gpio.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
|
||||
uint8_t board_id(void)
|
||||
{
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright 2014 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_RUSH_BOARDID_H__
|
||||
#define __MAINBOARD_GOOGLE_RUSH_BOARDID_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
uint8_t board_id(void);
|
||||
|
||||
#endif /* __MAINBOARD_GOOGLE_RUSH_BOARDID_H__ */
|
|
@ -24,7 +24,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
#include "pmic.h"
|
||||
#include "reset.h"
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <console/console.h>
|
||||
#include <soc/nvidia/tegra132/gpio.h>
|
||||
|
||||
#include "boardid.h"
|
||||
#include <boardid.h>
|
||||
|
||||
uint8_t board_id(void)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue