From f9fb0d9bf3944e643e76ea9336565e28cef30547 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Wed, 23 Jul 2014 18:32:01 -0700 Subject: [PATCH] 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 Original-Reviewed-on: https://chromium-review.googlesource.com/209699 Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Furquan Shaikh (cherry picked from commit 589e6415faf18ca6aaf44da343dd33eadc8a53d3) Signed-off-by: Marc Jones Change-Id: I8eef89cb822611a0050e5a50fc4b970eebd8d962 Reviewed-on: http://review.coreboot.org/8666 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- .../google/rush_ryu => include}/boardid.h | 6 ++--- src/mainboard/google/nyan/boardid.c | 2 +- src/mainboard/google/nyan/boardid.h | 27 ------------------- src/mainboard/google/nyan/pmic.c | 2 +- src/mainboard/google/nyan_big/boardid.c | 2 +- src/mainboard/google/nyan_big/boardid.h | 27 ------------------- src/mainboard/google/nyan_big/pmic.c | 2 +- src/mainboard/google/nyan_blaze/boardid.c | 2 +- src/mainboard/google/nyan_blaze/boardid.h | 27 ------------------- src/mainboard/google/nyan_blaze/pmic.c | 2 +- src/mainboard/google/rush/boardid.c | 2 +- src/mainboard/google/rush/boardid.h | 27 ------------------- src/mainboard/google/rush/pmic.c | 2 +- src/mainboard/google/rush_ryu/boardid.c | 2 +- 14 files changed, 12 insertions(+), 120 deletions(-) rename src/{mainboard/google/rush_ryu => include}/boardid.h (85%) delete mode 100644 src/mainboard/google/nyan/boardid.h delete mode 100644 src/mainboard/google/nyan_big/boardid.h delete mode 100644 src/mainboard/google/nyan_blaze/boardid.h delete mode 100644 src/mainboard/google/rush/boardid.h diff --git a/src/mainboard/google/rush_ryu/boardid.h b/src/include/boardid.h similarity index 85% rename from src/mainboard/google/rush_ryu/boardid.h rename to src/include/boardid.h index aa2ea5f903..d1c6ad9756 100644 --- a/src/mainboard/google/rush_ryu/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 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 18d920b6f5..a5ec61fa64 100644 --- a/src/mainboard/google/nyan/boardid.c +++ b/src/mainboard/google/nyan/boardid.c @@ -20,7 +20,7 @@ #include #include -#include "boardid.h" +#include 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 - -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 #include -#include "boardid.h" +#include #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 23b1c6adff..c7bd2e6a1d 100644 --- a/src/mainboard/google/nyan_big/boardid.c +++ b/src/mainboard/google/nyan_big/boardid.c @@ -21,7 +21,7 @@ #include #include -#include "boardid.h" +#include 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 8b200326aa..0000000000 --- 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 - -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 4d52f7072c..ed855f1e75 100644 --- a/src/mainboard/google/nyan_big/pmic.c +++ b/src/mainboard/google/nyan_big/pmic.c @@ -24,7 +24,7 @@ #include #include -#include "boardid.h" +#include #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 23b1c6adff..c7bd2e6a1d 100644 --- a/src/mainboard/google/nyan_blaze/boardid.c +++ b/src/mainboard/google/nyan_blaze/boardid.c @@ -21,7 +21,7 @@ #include #include -#include "boardid.h" +#include 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 0a3fe8016a..0000000000 --- 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 - -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 4d52f7072c..ed855f1e75 100644 --- a/src/mainboard/google/nyan_blaze/pmic.c +++ b/src/mainboard/google/nyan_blaze/pmic.c @@ -24,7 +24,7 @@ #include #include -#include "boardid.h" +#include #include "pmic.h" #include "reset.h" diff --git a/src/mainboard/google/rush/boardid.c b/src/mainboard/google/rush/boardid.c index 76bd4d9a84..67e55ba3fb 100644 --- a/src/mainboard/google/rush/boardid.c +++ b/src/mainboard/google/rush/boardid.c @@ -20,7 +20,7 @@ #include #include -#include "boardid.h" +#include uint8_t board_id(void) { diff --git a/src/mainboard/google/rush/boardid.h b/src/mainboard/google/rush/boardid.h deleted file mode 100644 index aa2ea5f903..0000000000 --- a/src/mainboard/google/rush/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 - -uint8_t board_id(void); - -#endif /* __MAINBOARD_GOOGLE_RUSH_BOARDID_H__ */ diff --git a/src/mainboard/google/rush/pmic.c b/src/mainboard/google/rush/pmic.c index 7aa7dc93d4..85de2003e7 100644 --- a/src/mainboard/google/rush/pmic.c +++ b/src/mainboard/google/rush/pmic.c @@ -24,7 +24,7 @@ #include #include -#include "boardid.h" +#include #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 76bd4d9a84..67e55ba3fb 100644 --- a/src/mainboard/google/rush_ryu/boardid.c +++ b/src/mainboard/google/rush_ryu/boardid.c @@ -20,7 +20,7 @@ #include #include -#include "boardid.h" +#include uint8_t board_id(void) {