diff options
| author | Martin Roth <martinroth@google.com> | 2017-11-11 14:33:47 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-11-13 20:19:53 +0000 |
| commit | b77bc6f5e70d441d8b9deb6fc0cd13d2952e5bce (patch) | |
| tree | e20834963cc85a256874db279b34b81f0e265afb | |
| parent | fa3aff09067bec65558174c30a93be0fbaa5bc44 (diff) | |
mb/google/kahlee: Remove mainboard.h
mainboard.h only had a single function definition. Move it into
baseboard/variants.h and get rid of the file.
TEST=Build grunt/kahlee
BUG=b:69164070
Change-Id: I6b7d50d5c949733d77c42b4daf56ed1f97ed6954
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/22434
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
5 files changed, 5 insertions, 26 deletions
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index c7689c892d..9c3f4ad666 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -19,7 +19,7 @@ #include <agesawrapper.h> #include <amd_pci_util.h> #include <ec.h> -#include <mainboard.h> +#include <baseboard/variants.h> #include <soc/smi.h> #include <vendorcode/google/chromeos/chromeos.h> diff --git a/src/mainboard/google/kahlee/mainboard.h b/src/mainboard/google/kahlee/mainboard.h deleted file mode 100644 index 5540d1b5db..0000000000 --- a/src/mainboard/google/kahlee/mainboard.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Advanced Micro Devices, 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. - */ - -#ifndef MAINBOARD_H -#define MAINBOARD_H - -#include <soc/smi.h> - -const struct sci_source *get_gpe_table(size_t *num); - -#endif /* MAINBOARD_H */ diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c index 175a321ec5..84e40b0c83 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c +++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c @@ -15,7 +15,7 @@ #include <AGESA.h> #include <FchPlatform.h> -#include <mainboard.h> +#include <baseboard/variants.h> #include <soc/smi.h> #include <soc/southbridge.h> #include <stdlib.h> diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h index 3b4da2636b..0a5780884f 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h @@ -18,7 +18,9 @@ #define __BASEBOARD_VARIANTS_H__ #include <stddef.h> +#include <soc/smi.h> +const struct sci_source *get_gpe_table(size_t *num); size_t variant_board_id(void); #endif /* __BASEBOARD_VARIANTS_H__ */ diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c index e25f1a1e42..3e981f5e17 100644 --- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c +++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c @@ -15,7 +15,7 @@ #include <AGESA.h> #include <FchPlatform.h> -#include <mainboard.h> +#include <baseboard/variants.h> #include <soc/smi.h> #include <soc/southbridge.h> #include <stdlib.h> |