diff options
97 files changed, 57 insertions, 994 deletions
diff --git a/src/cpu/amd/agesa/heapmanager.c b/src/cpu/amd/agesa/heapmanager.c index ed25f34772..d2c39312d5 100644 --- a/src/cpu/amd/agesa/heapmanager.c +++ b/src/cpu/amd/agesa/heapmanager.c @@ -1,7 +1,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "northbridge/amd/agesa/def_callouts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "heapManager.h" #include <cbmem.h> diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c index 099046996b..fc619f7a34 100644 --- a/src/cpu/amd/agesa/s3_resume.c +++ b/src/cpu/amd/agesa/s3_resume.c @@ -31,7 +31,7 @@ #include <arch/acpi.h> #include <string.h> #include "Porting.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "s3_resume.h" /* The size needs to be 4k aligned, which is the sector size of most flashes. */ 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" diff --git a/src/mainboard/asrock/e350m1/BiosCallOuts.c b/src/mainboard/asrock/e350m1/BiosCallOuts.c index 4a39cd6bc9..e88f4f944f 100644 --- a/src/mainboard/asrock/e350m1/BiosCallOuts.c +++ b/src/mainboard/asrock/e350m1/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/asrock/e350m1/BiosCallOuts.h b/src/mainboard/asrock/e350m1/BiosCallOuts.h deleted file mode 100644 index 1cb500635d..0000000000 --- a/src/mainboard/asrock/e350m1/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/asrock/e350m1/agesawrapper.c b/src/mainboard/asrock/e350m1/agesawrapper.c index 0e1ce0a2b6..68da91cc7b 100644 --- a/src/mainboard/asrock/e350m1/agesawrapper.c +++ b/src/mainboard/asrock/e350m1/agesawrapper.c @@ -25,7 +25,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/asrock/imb-a180/BiosCallOuts.c b/src/mainboard/asrock/imb-a180/BiosCallOuts.c index 54ba2168f4..53b687159b 100644 --- a/src/mainboard/asrock/imb-a180/BiosCallOuts.c +++ b/src/mainboard/asrock/imb-a180/BiosCallOuts.c @@ -20,7 +20,7 @@ #include <device/azalia.h> #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/asrock/imb-a180/BiosCallOuts.h b/src/mainboard/asrock/imb-a180/BiosCallOuts.h deleted file mode 100644 index 9db85d8b7e..0000000000 --- a/src/mainboard/asrock/imb-a180/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/asrock/imb-a180/agesawrapper.c b/src/mainboard/asrock/imb-a180/agesawrapper.c index 8b2074c7e6..7c79b3ce65 100644 --- a/src/mainboard/asrock/imb-a180/agesawrapper.c +++ b/src/mainboard/asrock/imb-a180/agesawrapper.c @@ -26,7 +26,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/asrock/imb-a180/mainboard.c b/src/mainboard/asrock/imb-a180/mainboard.c index cc6d9f8519..ac40c846a0 100644 --- a/src/mainboard/asrock/imb-a180/mainboard.c +++ b/src/mainboard/asrock/imb-a180/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/asus/f2a85-m/BiosCallOuts.c b/src/mainboard/asus/f2a85-m/BiosCallOuts.c index be901706eb..13bee0c85d 100644 --- a/src/mainboard/asus/f2a85-m/BiosCallOuts.c +++ b/src/mainboard/asus/f2a85-m/BiosCallOuts.c @@ -18,7 +18,7 @@ */ #include "AGESA.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "OptionsIds.h" #include <cbfs.h> diff --git a/src/mainboard/asus/f2a85-m/BiosCallOuts.h b/src/mainboard/asus/f2a85-m/BiosCallOuts.h deleted file mode 100644 index 45c5df315d..0000000000 --- a/src/mainboard/asus/f2a85-m/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/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c index a6deaccb80..0027a4bc6b 100644 --- a/src/mainboard/asus/f2a85-m/agesawrapper.c +++ b/src/mainboard/asus/f2a85-m/agesawrapper.c @@ -23,7 +23,7 @@ */ #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "PlatformGnbPcieComplex.h" #include <arch/io.h> diff --git a/src/mainboard/asus/f2a85-m/mainboard.c b/src/mainboard/asus/f2a85-m/mainboard.c index 1a64874064..191eea8b34 100644 --- a/src/mainboard/asus/f2a85-m/mainboard.c +++ b/src/mainboard/asus/f2a85-m/mainboard.c @@ -18,7 +18,7 @@ */ #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c index 9fd09e593f..574ca64ad2 100755 --- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c +++ b/src/mainboard/gizmosphere/gizmo/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/gizmosphere/gizmo/BiosCallOuts.h b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.h deleted file mode 100755 index 2743ae2549..0000000000 --- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Advanced Micro Devices, Inc. - * Copyright (C) 2013 Sage Electronic Engineering, LLC - * - * 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/gizmosphere/gizmo/agesawrapper.c b/src/mainboard/gizmosphere/gizmo/agesawrapper.c index c6ef79fd62..2a40d5374b 100755 --- a/src/mainboard/gizmosphere/gizmo/agesawrapper.c +++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.c @@ -19,7 +19,7 @@ */ #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "PlatformGnbPcieComplex.h" #define __SIMPLE_DEVICE__ diff --git a/src/mainboard/gizmosphere/gizmo/mainboard.c b/src/mainboard/gizmosphere/gizmo/mainboard.c index 78bb6fa04d..a9afdfbd15 100755 --- a/src/mainboard/gizmosphere/gizmo/mainboard.c +++ b/src/mainboard/gizmosphere/gizmo/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <southbridge/amd/sb800/sb800.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/hp/pavilion_m6_1035dx/BiosCallOuts.c b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c index ad3f041b6c..5373d909a0 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c @@ -18,7 +18,7 @@ */ #include "AGESA.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "OptionsIds.h" #include <cbfs.h> diff --git a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.h b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.h deleted file mode 100644 index 45c5df315d..0000000000 --- a/src/mainboard/hp/pavilion_m6_1035dx/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/hp/pavilion_m6_1035dx/agesawrapper.c b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c index 9c3423021a..f23d52df74 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c @@ -23,7 +23,7 @@ */ #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "PlatformGnbPcieComplex.h" #define __SIMPLE_DEVICE__ diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c index 53c5342579..f8584553ef 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c @@ -18,7 +18,7 @@ */ #include "agesawrapper.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "ec.h" #include <arch/acpi.h> diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c index dd3d4cf206..cb94337017 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c +++ b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c @@ -18,7 +18,7 @@ */ #include "AGESA.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <Lib/amdlib.h> #include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h> diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.h b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.h deleted file mode 100644 index 1cb500635d..0000000000 --- a/src/mainboard/jetway/nf81-t56n-lf/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/jetway/nf81-t56n-lf/agesawrapper.c b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c index ed70fc8d00..31c8e72f56 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c +++ b/src/mainboard/jetway/nf81-t56n-lf/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/jetway/nf81-t56n-lf/mainboard.c b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c index 5f08149b10..d67e072b8a 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c +++ b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c index 6c12e4715f..9fc4f74609 100644 --- a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c +++ b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "SB800.h" #include <southbridge/amd/cimx/sb800/gpio_oem.h> #include "heapManager.h" diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.h b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.h deleted file mode 100644 index 0ba428f29d..0000000000 --- a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.h +++ /dev/null @@ -1,26 +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/lippert/frontrunner-af/agesawrapper.c b/src/mainboard/lippert/frontrunner-af/agesawrapper.c index 4a0348da0d..fc0bee2d9b 100644 --- a/src/mainboard/lippert/frontrunner-af/agesawrapper.c +++ b/src/mainboard/lippert/frontrunner-af/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/lippert/frontrunner-af/mainboard.c b/src/mainboard/lippert/frontrunner-af/mainboard.c index fd7111b4db..ee538c3be5 100644 --- a/src/mainboard/lippert/frontrunner-af/mainboard.c +++ b/src/mainboard/lippert/frontrunner-af/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <southbridge/amd/sb800/sb800.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/lippert/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/toucan-af/BiosCallOuts.c index 87a2ae02d2..4b30c3967f 100644 --- a/src/mainboard/lippert/toucan-af/BiosCallOuts.c +++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.c @@ -19,7 +19,7 @@ #include "AGESA.h" #include "amdlib.h" -#include "BiosCallOuts.h" +#include <northbridge/amd/agesa/BiosCallOuts.h> #include "SB800.h" #include <southbridge/amd/cimx/sb800/gpio_oem.h> #include "heapManager.h" diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.h b/src/mainboard/lippert/toucan-af/BiosCallOuts.h deleted file mode 100644 index 0ba428f29d..0000000000 --- a/src/mainboard/lippert/toucan-af/BiosCallOuts.h +++ /dev/null @@ -1,26 +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/lippert/toucan-af/agesawrapper.c b/src/mainboard/lippert/toucan-af/agesawrapper.c index 4a0348da0d..fc0bee2d9b 100644 --- a/src/mainboard/lippert/toucan-af/agesawrapper.c +++ b/src/mainboard/lippert/toucan-af/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/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c index 50b981bf5b..9e44a21026 100644 --- a/src/mainboard/lippert/toucan-af/mainboard.c +++ b/src/mainboard/lippert/toucan-af/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <southbridge/amd/sb800/sb800.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/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c index 7b7d5e128c..15244b519c 100644 --- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c +++ b/src/mainboard/supermicro/h8qgi/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/supermicro/h8qgi/BiosCallOuts.h b/src/mainboard/supermicro/h8qgi/BiosCallOuts.h deleted file mode 100644 index c53a687506..0000000000 --- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.h +++ /dev/null @@ -1,36 +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/family15/fam15_callouts.h> - - -#define SB_GPIO_REG02 2 -#define SB_GPIO_REG09 9 -#define SB_GPIO_REG10 10 -#define SB_GPIO_REG15 15 -#define SB_GPIO_REG17 17 -#define SB_GPIO_REG21 21 -#define SB_GPIO_REG25 25 -#define SB_GPIO_REG28 28 - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.c b/src/mainboard/supermicro/h8qgi/agesawrapper.c index 294410c200..a8ea827b2f 100644 --- a/src/mainboard/supermicro/h8qgi/agesawrapper.c +++ b/src/mainboard/supermicro/h8qgi/agesawrapper.c @@ -26,7 +26,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/supermicro/h8scm/BiosCallOuts.c b/src/mainboard/supermicro/h8scm/BiosCallOuts.c index c891dbd13b..5d5b1bdf78 100644 --- a/src/mainboard/supermicro/h8scm/BiosCallOuts.c +++ b/src/mainboard/supermicro/h8scm/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/supermicro/h8scm/BiosCallOuts.h b/src/mainboard/supermicro/h8scm/BiosCallOuts.h deleted file mode 100644 index 30b66f43a1..0000000000 --- a/src/mainboard/supermicro/h8scm/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/family15/fam15_callouts.h> - - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.c b/src/mainboard/supermicro/h8scm/agesawrapper.c index b3c0bd27f8..3201a756bb 100644 --- a/src/mainboard/supermicro/h8scm/agesawrapper.c +++ b/src/mainboard/supermicro/h8scm/agesawrapper.c @@ -26,7 +26,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/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c index becb4d0ba9..19f0b4f3d4 100644 --- a/src/mainboard/tyan/s8226/BiosCallOuts.c +++ b/src/mainboard/tyan/s8226/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/tyan/s8226/BiosCallOuts.h b/src/mainboard/tyan/s8226/BiosCallOuts.h deleted file mode 100644 index c53a687506..0000000000 --- a/src/mainboard/tyan/s8226/BiosCallOuts.h +++ /dev/null @@ -1,36 +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/family15/fam15_callouts.h> - - -#define SB_GPIO_REG02 2 -#define SB_GPIO_REG09 9 -#define SB_GPIO_REG10 10 -#define SB_GPIO_REG15 15 -#define SB_GPIO_REG17 17 -#define SB_GPIO_REG21 21 -#define SB_GPIO_REG25 25 -#define SB_GPIO_REG28 28 - -#endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/tyan/s8226/agesawrapper.c b/src/mainboard/tyan/s8226/agesawrapper.c index 9f66b4c95e..979508ceb6 100644 --- a/src/mainboard/tyan/s8226/agesawrapper.c +++ b/src/mainboard/tyan/s8226/agesawrapper.c @@ -26,7 +26,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/northbridge/amd/agesa/00730F01/Makefile.inc b/src/northbridge/amd/agesa/00730F01/Makefile.inc index 08f94bf46a..4a754995eb 100644 --- a/src/northbridge/amd/agesa/00730F01/Makefile.inc +++ b/src/northbridge/amd/agesa/00730F01/Makefile.inc @@ -17,8 +17,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -romstage-y += callouts_for_00730F01.c romstage-y += dimmSpd.c ramstage-y += northbridge.c -ramstage-y += callouts_for_00730F01.c diff --git a/src/northbridge/amd/agesa/00730F01/callouts_for_00730F01.c b/src/northbridge/amd/agesa/00730F01/callouts_for_00730F01.c deleted file mode 100644 index 75f1849afe..0000000000 --- a/src/northbridge/amd/agesa/00730F01/callouts_for_00730F01.c +++ /dev/null @@ -1,29 +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 - */ - -#include "agesawrapper.h" -#include "amdlib.h" -#include "Ids.h" -#include "OptionsIds.h" -#include "heapManager.h" -#include "FchPlatform.h" -#include "cbfs.h" -#include "callouts_for_00730F01.h" -#include "northbridge/amd/agesa/def_callouts.h" - diff --git a/src/northbridge/amd/agesa/00730F01/callouts_for_00730F01.h b/src/northbridge/amd/agesa/00730F01/callouts_for_00730F01.h deleted file mode 100644 index 31bd721038..0000000000 --- a/src/northbridge/amd/agesa/00730F01/callouts_for_00730F01.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 CALLOUTS_AMD_AGESA_FAM16_0X30_H -#define CALLOUTS_AMD_AGESA_FAM16_0X30_H - -#include "Porting.h" -#include "AGESA.h" - - -#endif /* CALLOUTS_AMD_AGESA_FAM16_0X30_H */ diff --git a/src/northbridge/amd/agesa/def_callouts.h b/src/northbridge/amd/agesa/BiosCallOuts.h index 60299b792e..60299b792e 100644 --- a/src/northbridge/amd/agesa/def_callouts.h +++ b/src/northbridge/amd/agesa/BiosCallOuts.h diff --git a/src/northbridge/amd/agesa/def_callouts.c b/src/northbridge/amd/agesa/def_callouts.c index fd8e373b67..ee79be233f 100644 --- a/src/northbridge/amd/agesa/def_callouts.c +++ b/src/northbridge/amd/agesa/def_callouts.c @@ -25,7 +25,7 @@ #include "amdlib.h" #include "Ids.h" #include "agesawrapper.h" -#include "def_callouts.h" +#include "BiosCallOuts.h" #include "dimmSpd.h" AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr) diff --git a/src/northbridge/amd/agesa/family12/Makefile.inc b/src/northbridge/amd/agesa/family12/Makefile.inc index af67f69779..8eaa70b01d 100644 --- a/src/northbridge/amd/agesa/family12/Makefile.inc +++ b/src/northbridge/amd/agesa/family12/Makefile.inc @@ -17,10 +17,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -romstage-y += fam12_callouts.c romstage-y += dimmSpd.c ramstage-y += northbridge.c -ramstage-y += fam12_callouts.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.asl diff --git a/src/northbridge/amd/agesa/family12/fam12_callouts.c b/src/northbridge/amd/agesa/family12/fam12_callouts.c deleted file mode 100644 index aa707a899f..0000000000 --- a/src/northbridge/amd/agesa/family12/fam12_callouts.c +++ /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 - */ - -#include "agesawrapper.h" -#include "amdlib.h" -#include "BiosCallOuts.h" -#include "Ids.h" -#include "OptionsIds.h" -#include "heapManager.h" -#include "Hudson-2.h" - diff --git a/src/northbridge/amd/agesa/family12/fam12_callouts.h b/src/northbridge/amd/agesa/family12/fam12_callouts.h deleted file mode 100644 index 46f4fe514e..0000000000 --- a/src/northbridge/amd/agesa/family12/fam12_callouts.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 CALLOUTS_AMD_AGESA_FAM12_H -#define CALLOUTS_AMD_AGESA_FAM12_H - -#include "Porting.h" -#include "AGESA.h" - - - -#endif /* CALLOUTS_AMD_AGESA_FAM12_H */ diff --git a/src/northbridge/amd/agesa/family14/Makefile.inc b/src/northbridge/amd/agesa/family14/Makefile.inc index db2f05f353..e7093fe483 100644 --- a/src/northbridge/amd/agesa/family14/Makefile.inc +++ b/src/northbridge/amd/agesa/family14/Makefile.inc @@ -17,8 +17,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -romstage-y += fam14_callouts.c romstage-y += dimmSpd.c ramstage-y += northbridge.c -ramstage-y += fam14_callouts.c diff --git a/src/northbridge/amd/agesa/family14/fam14_callouts.c b/src/northbridge/amd/agesa/family14/fam14_callouts.c deleted file mode 100644 index a00c25a231..0000000000 --- a/src/northbridge/amd/agesa/family14/fam14_callouts.c +++ /dev/null @@ -1,25 +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 - */ - -#include "agesawrapper.h" -#include "amdlib.h" -#include "fam14_callouts.h" -#include "heapManager.h" -#include "SB800.h" - diff --git a/src/northbridge/amd/agesa/family14/fam14_callouts.h b/src/northbridge/amd/agesa/family14/fam14_callouts.h deleted file mode 100644 index b9a36fe88c..0000000000 --- a/src/northbridge/amd/agesa/family14/fam14_callouts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Advanced Micro Devices, Inc. - * Copyright (C) 2013 Sage Electronic Engineering, LLC - * - * 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 CALLOUTS_AMD_AGESA_FAM14_H -#define CALLOUTS_AMD_AGESA_FAM14_H - -#include "Porting.h" -#include "AGESA.h" - - -#endif /* CALLOUTS_AMD_AGESA_FAM14_H */ diff --git a/src/northbridge/amd/agesa/family15/Makefile.inc b/src/northbridge/amd/agesa/family15/Makefile.inc index 41b7d7f4c5..4a754995eb 100644 --- a/src/northbridge/amd/agesa/family15/Makefile.inc +++ b/src/northbridge/amd/agesa/family15/Makefile.inc @@ -17,8 +17,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -romstage-y += fam15_callouts.c romstage-y += dimmSpd.c ramstage-y += northbridge.c -ramstage-y += fam15_callouts.c diff --git a/src/northbridge/amd/agesa/family15/fam15_callouts.c b/src/northbridge/amd/agesa/family15/fam15_callouts.c deleted file mode 100644 index a049a0e6dc..0000000000 --- a/src/northbridge/amd/agesa/family15/fam15_callouts.c +++ /dev/null @@ -1,26 +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 - */ - -#include "agesawrapper.h" -#include "amdlib.h" -#include "BiosCallOuts.h" -#include "Ids.h" -#include "OptionsIds.h" -#include "heapManager.h" -#include <arch/io.h> diff --git a/src/northbridge/amd/agesa/family15/fam15_callouts.h b/src/northbridge/amd/agesa/family15/fam15_callouts.h deleted file mode 100644 index 2be43db14c..0000000000 --- a/src/northbridge/amd/agesa/family15/fam15_callouts.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Advanced Micro Devices, Inc. - * Copyright (C) 2013 Sage Electronic Engineering, LLC - * - * 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 CALLOUTS_AMD_AGESA_FAM15_H -#define CALLOUTS_AMD_AGESA_FAM15_H - - - -/* Call the host environment interface to provide a user hook opportunity. */ -AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr); - -#endif /* CALLOUTS_AMD_AGESA_FAM15_H */ diff --git a/src/northbridge/amd/agesa/family15tn/Makefile.inc b/src/northbridge/amd/agesa/family15tn/Makefile.inc index c4d4b0ddce..5013364b9e 100644 --- a/src/northbridge/amd/agesa/family15tn/Makefile.inc +++ b/src/northbridge/amd/agesa/family15tn/Makefile.inc @@ -17,9 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -romstage-y += fam15tn_callouts.c romstage-y += dimmSpd.c ramstage-y += iommu.c ramstage-y += northbridge.c -ramstage-y += fam15tn_callouts.c diff --git a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c deleted file mode 100644 index 287cb97330..0000000000 --- a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c +++ /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 - */ - -#include "agesawrapper.h" -#include "amdlib.h" -#include "Ids.h" -#include "OptionsIds.h" -#include "heapManager.h" -#include "FchPlatform.h" -#include "cbfs.h" -#include "fam15tn_callouts.h" - diff --git a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.h b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.h deleted file mode 100644 index d6d265ef7c..0000000000 --- a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.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 CALLOUTS_AMD_AGESA_FAM15TN_H -#define CALLOUTS_AMD_AGESA_FAM15TN_H - -#include "Porting.h" -#include "AGESA.h" - - -#endif /* CALLOUTS_AMD_AGESA_FAM15TN_H */ diff --git a/src/northbridge/amd/agesa/family16kb/Makefile.inc b/src/northbridge/amd/agesa/family16kb/Makefile.inc index 2fa4736889..4a754995eb 100644 --- a/src/northbridge/amd/agesa/family16kb/Makefile.inc +++ b/src/northbridge/amd/agesa/family16kb/Makefile.inc @@ -17,8 +17,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -romstage-y += fam16kb_callouts.c romstage-y += dimmSpd.c ramstage-y += northbridge.c -ramstage-y += fam16kb_callouts.c diff --git a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c b/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c deleted file mode 100644 index 2e1cd3db4b..0000000000 --- a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c +++ /dev/null @@ -1,31 +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 - */ - -#include "agesawrapper.h" -#include "amdlib.h" -#include "Ids.h" -#include "OptionsIds.h" -#include "heapManager.h" -#include "FchPlatform.h" -#include "cbfs.h" -#include "fam16kb_callouts.h" - - - - diff --git a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.h b/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.h deleted file mode 100644 index debdc4ba69..0000000000 --- a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.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 CALLOUTS_AMD_AGESA_FAM16KB_H -#define CALLOUTS_AMD_AGESA_FAM16KB_H - -#include "Porting.h" -#include "AGESA.h" - - -#endif /* CALLOUTS_AMD_AGESA_FAM16KB_H */ |