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.
Change-Id: Ifbe9c2287a1d828d4db74c637d1d02047ac4da25
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/209699
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
diff --git a/src/mainboard/google/rush/boardid.h b/src/include/boardid.h
similarity index 85%
rename from src/mainboard/google/rush/boardid.h
rename to src/include/boardid.h
index aa2ea5f..d1c6ad9 100644
--- a/src/mainboard/google/rush/boardid.h
+++ b/src/include/boardid.h
@@ -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__ */
diff --git a/src/mainboard/google/nyan/boardid.c b/src/mainboard/google/nyan/boardid.c
index 18d920b..a5ec61f 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 b65f543..0000000
--- 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 e981504..43c0e91 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"
diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c
index 23b1c6a..c7bd2e6 100644
--- a/src/mainboard/google/nyan_big/boardid.c
+++ b/src/mainboard/google/nyan_big/boardid.c
@@ -21,7 +21,7 @@
#include <soc/nvidia/tegra124/gpio.h>
#include <stdlib.h>
-#include "boardid.h"
+#include <boardid.h>
uint8_t board_id(void)
{
diff --git a/src/mainboard/google/nyan_big/boardid.h b/src/mainboard/google/nyan_big/boardid.h
deleted file mode 100644
index 8b20032..0000000
--- a/src/mainboard/google/nyan_big/boardid.h
+++ /dev/null
@@ -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__ */
diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c
index 442968f..19f4708 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -24,7 +24,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "boardid.h"
+#include <boardid.h>
#include "pmic.h"
#include "reset.h"
diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c
index 23b1c6a..c7bd2e6 100644
--- a/src/mainboard/google/nyan_blaze/boardid.c
+++ b/src/mainboard/google/nyan_blaze/boardid.c
@@ -21,7 +21,7 @@
#include <soc/nvidia/tegra124/gpio.h>
#include <stdlib.h>
-#include "boardid.h"
+#include <boardid.h>
uint8_t board_id(void)
{
diff --git a/src/mainboard/google/nyan_blaze/boardid.h b/src/mainboard/google/nyan_blaze/boardid.h
deleted file mode 100644
index 0a3fe80..0000000
--- a/src/mainboard/google/nyan_blaze/boardid.h
+++ /dev/null
@@ -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__ */
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index 442968f..19f4708 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -24,7 +24,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "boardid.h"
+#include <boardid.h>
#include "pmic.h"
#include "reset.h"
diff --git a/src/mainboard/google/rush/boardid.c b/src/mainboard/google/rush/boardid.c
index 76bd4d9..67e55ba 100644
--- a/src/mainboard/google/rush/boardid.c
+++ b/src/mainboard/google/rush/boardid.c
@@ -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)
{
diff --git a/src/mainboard/google/rush/pmic.c b/src/mainboard/google/rush/pmic.c
index 5fc3b17..e01675e 100644
--- a/src/mainboard/google/rush/pmic.c
+++ b/src/mainboard/google/rush/pmic.c
@@ -24,7 +24,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "boardid.h"
+#include <boardid.h>
#include "pmic.h"
#include "reset.h"
diff --git a/src/mainboard/google/rush_ryu/boardid.c b/src/mainboard/google/rush_ryu/boardid.c
index 76bd4d9..67e55ba 100644
--- a/src/mainboard/google/rush_ryu/boardid.c
+++ b/src/mainboard/google/rush_ryu/boardid.c
@@ -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)
{
diff --git a/src/mainboard/google/rush_ryu/boardid.h b/src/mainboard/google/rush_ryu/boardid.h
deleted file mode 100644
index aa2ea5f..0000000
--- a/src/mainboard/google/rush_ryu/boardid.h
+++ /dev/null
@@ -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__ */
