diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-05-26 11:27:54 +0300 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-10-19 06:20:58 +0200 |
commit | 26f297e98109d8dd6e09dcb69ec371463732e464 (patch) | |
tree | d5913e13ab33b65487b9c2191abbc861a0f91a0a /src/mainboard/amd | |
parent | 50c9637e15ddd78f896419f2335457de4fe22d77 (diff) |
AGESA: Drop board and chipset -specific callout headers
Change-Id: If973f28931e65a57cbb8d6739542a57c844f0d66
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7115
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard/amd')
35 files changed, 25 insertions, 301 deletions
diff --git a/src/mainboard/amd/dinar/BiosCallOuts.c b/src/mainboard/amd/dinar/BiosCallOuts.c index 60aa671c04..4e0e3b905a 100644 --- a/src/mainboard/amd/dinar/BiosCallOuts.c +++ b/src/mainboard/amd/dinar/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "Ids.h" #include "OptionsIds.h" #include "heapManager.h" diff --git a/src/mainboard/amd/dinar/BiosCallOuts.h b/src/mainboard/amd/dinar/BiosCallOuts.h deleted file mode 100644 index 0a890a3a04..0000000000 --- a/src/mainboard/amd/dinar/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family15/fam15_callouts.h> - - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/dinar/agesawrapper.c b/src/mainboard/amd/dinar/agesawrapper.c index a8fc62e95d..1338ee2096 100644 --- a/src/mainboard/amd/dinar/agesawrapper.c +++ b/src/mainboard/amd/dinar/agesawrapper.c @@ -21,7 +21,7 @@ #include <string.h> #include <cpu/x86/mtrr.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c index 4503c30f1c..69bb2c2e50 100644 --- a/src/mainboard/amd/inagua/BiosCallOuts.c +++ b/src/mainboard/amd/inagua/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "heapManager.h" #include "SB800.h" #include <southbridge/amd/cimx/sb800/gpio_oem.h> diff --git a/src/mainboard/amd/inagua/BiosCallOuts.h b/src/mainboard/amd/inagua/BiosCallOuts.h deleted file mode 100644 index 9c4bef2de7..0000000000 --- a/src/mainboard/amd/inagua/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family14/fam14_callouts.h> - - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/inagua/agesawrapper.c b/src/mainboard/amd/inagua/agesawrapper.c index 49b96b571f..75a1c2f4b0 100644 --- a/src/mainboard/amd/inagua/agesawrapper.c +++ b/src/mainboard/amd/inagua/agesawrapper.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <string.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/olivehill/BiosCallOuts.c b/src/mainboard/amd/olivehill/BiosCallOuts.c index bb43e19e1d..97f876939a 100644 --- a/src/mainboard/amd/olivehill/BiosCallOuts.c +++ b/src/mainboard/amd/olivehill/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "Ids.h" #include "OptionsIds.h" #include "heapManager.h" diff --git a/src/mainboard/amd/olivehill/BiosCallOuts.h b/src/mainboard/amd/olivehill/BiosCallOuts.h deleted file mode 100644 index 9db85d8b7e..0000000000 --- a/src/mainboard/amd/olivehill/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family16kb/fam16kb_callouts.h> - - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/olivehill/agesawrapper.c b/src/mainboard/amd/olivehill/agesawrapper.c index e3c6d8fb71..8cb4728c62 100644 --- a/src/mainboard/amd/olivehill/agesawrapper.c +++ b/src/mainboard/amd/olivehill/agesawrapper.c @@ -21,7 +21,7 @@ #include <string.h> #include <cpu/x86/mtrr.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/olivehill/mainboard.c b/src/mainboard/amd/olivehill/mainboard.c index cc6d9f8519..ac40c846a0 100644 --- a/src/mainboard/amd/olivehill/mainboard.c +++ b/src/mainboard/amd/olivehill/mainboard.c @@ -25,7 +25,7 @@ #include <cpu/amd/mtrr.h> #include <device/pci_def.h> #include <arch/acpi.h> -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <cpu/amd/agesa/s3_resume.h> #include "agesawrapper.h" diff --git a/src/mainboard/amd/olivehillplus/BiosCallOuts.c b/src/mainboard/amd/olivehillplus/BiosCallOuts.c index 88e316b79e..5720250939 100644 --- a/src/mainboard/amd/olivehillplus/BiosCallOuts.c +++ b/src/mainboard/amd/olivehillplus/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "Ids.h" #include "OptionsIds.h" #include "heapManager.h" diff --git a/src/mainboard/amd/olivehillplus/BiosCallOuts.h b/src/mainboard/amd/olivehillplus/BiosCallOuts.h deleted file mode 100644 index 1994774488..0000000000 --- a/src/mainboard/amd/olivehillplus/BiosCallOuts.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/00730F01/callouts_for_00730F01.h> - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/olivehillplus/agesawrapper.c b/src/mainboard/amd/olivehillplus/agesawrapper.c index eecb45dbfa..6b4835e75e 100644 --- a/src/mainboard/amd/olivehillplus/agesawrapper.c +++ b/src/mainboard/amd/olivehillplus/agesawrapper.c @@ -22,7 +22,7 @@ #include <config.h> #include <cpu/x86/mtrr.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/olivehillplus/mainboard.c b/src/mainboard/amd/olivehillplus/mainboard.c index f7f41010a2..6073fd4322 100644 --- a/src/mainboard/amd/olivehillplus/mainboard.c +++ b/src/mainboard/amd/olivehillplus/mainboard.c @@ -23,7 +23,7 @@ #include <arch/io.h> #include <device/pci_def.h> #include <arch/acpi.h> -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <cpu/amd/agesa/s3_resume.h> #include "agesawrapper.h" #include <cpu/x86/msr.h> diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c index 9d7ab0b785..e09218efe1 100644 --- a/src/mainboard/amd/parmer/BiosCallOuts.c +++ b/src/mainboard/amd/parmer/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "Ids.h" #include "OptionsIds.h" #include "heapManager.h" diff --git a/src/mainboard/amd/parmer/BiosCallOuts.h b/src/mainboard/amd/parmer/BiosCallOuts.h deleted file mode 100644 index 45c5df315d..0000000000 --- a/src/mainboard/amd/parmer/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family15tn/fam15tn_callouts.h> - - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c index d9b23de5fb..477ba8767a 100644 --- a/src/mainboard/amd/parmer/agesawrapper.c +++ b/src/mainboard/amd/parmer/agesawrapper.c @@ -21,7 +21,7 @@ #include <string.h> #include <cpu/x86/mtrr.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c index 214cb21368..2ba714a32e 100644 --- a/src/mainboard/amd/parmer/mainboard.c +++ b/src/mainboard/amd/parmer/mainboard.c @@ -22,7 +22,7 @@ #include <device/pci.h> #include <arch/io.h> #include <cpu/x86/msr.h> -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> #include <arch/acpi.h> diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c index c700324768..7fa05346c6 100644 --- a/src/mainboard/amd/persimmon/BiosCallOuts.c +++ b/src/mainboard/amd/persimmon/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "heapManager.h" #include "SB800.h" #include <stdlib.h> diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.h b/src/mainboard/amd/persimmon/BiosCallOuts.h deleted file mode 100644 index 1cb500635d..0000000000 --- a/src/mainboard/amd/persimmon/BiosCallOuts.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family14/fam14_callouts.h> - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/persimmon/agesawrapper.c b/src/mainboard/amd/persimmon/agesawrapper.c index b3a217afa3..2c82ad1d85 100644 --- a/src/mainboard/amd/persimmon/agesawrapper.c +++ b/src/mainboard/amd/persimmon/agesawrapper.c @@ -18,7 +18,7 @@ */ #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "PlatformGnbPcieComplex.h" #define __SIMPLE_DEVICE__ diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c index d3c5b8fec6..58ac9833ac 100644 --- a/src/mainboard/amd/persimmon/mainboard.c +++ b/src/mainboard/amd/persimmon/mainboard.c @@ -27,7 +27,7 @@ #include <southbridge/amd/amd_pci_util.h> #include <southbridge/amd/cimx/cimx_util.h> #include <arch/acpi.h> -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <cpu/amd/agesa/s3_resume.h> #include <cpu/amd/mtrr.h> #include "SBPLATFORM.h" diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c index cd265ab192..693f1594db 100644 --- a/src/mainboard/amd/south_station/BiosCallOuts.c +++ b/src/mainboard/amd/south_station/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "heapManager.h" #include "SB800.h" #include <southbridge/amd/cimx/sb800/gpio_oem.h> diff --git a/src/mainboard/amd/south_station/BiosCallOuts.h b/src/mainboard/amd/south_station/BiosCallOuts.h deleted file mode 100644 index 1cb500635d..0000000000 --- a/src/mainboard/amd/south_station/BiosCallOuts.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family14/fam14_callouts.h> - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/south_station/agesawrapper.c b/src/mainboard/amd/south_station/agesawrapper.c index 98dd09d065..2c7549bfc9 100644 --- a/src/mainboard/amd/south_station/agesawrapper.c +++ b/src/mainboard/amd/south_station/agesawrapper.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <string.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.c b/src/mainboard/amd/thatcher/BiosCallOuts.c index 921fcf4ac5..3bd7237a29 100644 --- a/src/mainboard/amd/thatcher/BiosCallOuts.c +++ b/src/mainboard/amd/thatcher/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "Ids.h" #include "OptionsIds.h" #include "heapManager.h" diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.h b/src/mainboard/amd/thatcher/BiosCallOuts.h deleted file mode 100644 index 45c5df315d..0000000000 --- a/src/mainboard/amd/thatcher/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family15tn/fam15tn_callouts.h> - - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c index e6b60f9444..b9e2d7ad1d 100644 --- a/src/mainboard/amd/thatcher/agesawrapper.c +++ b/src/mainboard/amd/thatcher/agesawrapper.c @@ -21,7 +21,7 @@ #include <string.h> #include <cpu/x86/mtrr.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/thatcher/mainboard.c b/src/mainboard/amd/thatcher/mainboard.c index 2eacf76ef8..834117efb3 100644 --- a/src/mainboard/amd/thatcher/mainboard.c +++ b/src/mainboard/amd/thatcher/mainboard.c @@ -22,7 +22,7 @@ #include <device/pci.h> #include <arch/io.h> #include <cpu/x86/msr.h> -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> #include <arch/acpi.h> diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c index 190cbadfce..3a89da21a1 100644 --- a/src/mainboard/amd/torpedo/BiosCallOuts.c +++ b/src/mainboard/amd/torpedo/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "Ids.h" #include "OptionsIds.h" #include "heapManager.h" diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.h b/src/mainboard/amd/torpedo/BiosCallOuts.h deleted file mode 100644 index 24bf5faff3..0000000000 --- a/src/mainboard/amd/torpedo/BiosCallOuts.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family12/fam12_callouts.h> - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/torpedo/agesawrapper.c b/src/mainboard/amd/torpedo/agesawrapper.c index 4088386e49..a379c677c0 100644 --- a/src/mainboard/amd/torpedo/agesawrapper.c +++ b/src/mainboard/amd/torpedo/agesawrapper.c @@ -21,7 +21,7 @@ #include <string.h> #include <cpu/x86/mtrr.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c index cd265ab192..693f1594db 100644 --- a/src/mainboard/amd/union_station/BiosCallOuts.c +++ b/src/mainboard/amd/union_station/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "heapManager.h" #include "SB800.h" #include <southbridge/amd/cimx/sb800/gpio_oem.h> diff --git a/src/mainboard/amd/union_station/BiosCallOuts.h b/src/mainboard/amd/union_station/BiosCallOuts.h deleted file mode 100644 index 9c4bef2de7..0000000000 --- a/src/mainboard/amd/union_station/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 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. - * - * 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 _BIOS_CALLOUT_H_ -#define _BIOS_CALLOUT_H_ - -#include <northbridge/amd/agesa/def_callouts.h> -#include <northbridge/amd/agesa/family14/fam14_callouts.h> - - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/amd/union_station/agesawrapper.c b/src/mainboard/amd/union_station/agesawrapper.c index 98dd09d065..2c7549bfc9 100644 --- a/src/mainboard/amd/union_station/agesawrapper.c +++ b/src/mainboard/amd/union_station/agesawrapper.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <string.h> #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" #include "cpuApicUtilities.h" |