diff options
31 files changed, 43 insertions, 43 deletions
diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c index 398fadbf09..158642a038 100644 --- a/src/mainboard/amd/gardenia/BiosCallOuts.c +++ b/src/mainboard/amd/gardenia/BiosCallOuts.c @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> -#include <BiosCallOuts.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/BiosCallOuts.h> #include <soc/imc.h> #include <soc/southbridge.h> #include <stdlib.h> diff --git a/src/mainboard/amd/gardenia/OemCustomize.c b/src/mainboard/amd/gardenia/OemCustomize.c index 8c7a8acff4..f4d77696af 100644 --- a/src/mainboard/amd/gardenia/OemCustomize.c +++ b/src/mainboard/amd/gardenia/OemCustomize.c @@ -14,7 +14,7 @@ */ #include <chip.h> -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #define DIMMS_PER_CHANNEL 2 #if DIMMS_PER_CHANNEL > MAX_DIMMS_PER_CH diff --git a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c index 6b52162ee6..7e60daee27 100644 --- a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c +++ b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> -#include <BiosCallOuts.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/BiosCallOuts.h> #include <soc/southbridge.h> #include <stdlib.h> diff --git a/src/mainboard/amd/gardenia/bootblock/OemCustomize.c b/src/mainboard/amd/gardenia/bootblock/OemCustomize.c index 82b77f288b..0d837ccc34 100644 --- a/src/mainboard/amd/gardenia/bootblock/OemCustomize.c +++ b/src/mainboard/amd/gardenia/bootblock/OemCustomize.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c index 25cf5b37c2..824fd9d979 100644 --- a/src/mainboard/amd/gardenia/mainboard.c +++ b/src/mainboard/amd/gardenia/mainboard.c @@ -16,7 +16,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/acpi.h> -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <amdblocks/amd_pci_util.h> /*********************************************************** diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c index fd8465a240..1c0df4d80a 100644 --- a/src/mainboard/google/kahlee/BiosCallOuts.c +++ b/src/mainboard/google/kahlee/BiosCallOuts.c @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> -#include <BiosCallOuts.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/BiosCallOuts.h> #include <soc/southbridge.h> #include <stdlib.h> #include <baseboard/variants.h> diff --git a/src/mainboard/google/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/OemCustomize.c index c50752698a..8ab8e547bc 100644 --- a/src/mainboard/google/kahlee/OemCustomize.c +++ b/src/mainboard/google/kahlee/OemCustomize.c @@ -14,7 +14,7 @@ */ #include <chip.h> -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #define DIMMS_PER_CHANNEL 1 #if DIMMS_PER_CHANNEL > MAX_DIMMS_PER_CH diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index fc13567aae..0954a2923b 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -16,7 +16,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/acpi.h> -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <amdblocks/amd_pci_util.h> #include <cbmem.h> #include <baseboard/variants.h> diff --git a/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c b/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c index b46c2dad7e..622152b8e6 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c +++ b/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <variant/gpio.h> static const PCIe_PORT_DESCRIPTOR PortList[] = { diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c index 0dac5fff7c..c2ec65f2af 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c +++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <baseboard/variants.h> #include <soc/gpio.h> #include <soc/smi.h> diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h index 33054f554e..9c547946e9 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h @@ -19,7 +19,7 @@ #include <stddef.h> #include <soc/smi.h> -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> const GPIO_CONTROL *get_gpio_table(void); const struct sci_source *get_gpe_table(size_t *num); diff --git a/src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c index 7451847ed2..568ed31538 100644 --- a/src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c +++ b/src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <variant/gpio.h> static const PCIe_PORT_DESCRIPTOR PortList[] = { diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c index 97b0655ae9..14424b7b98 100644 --- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c +++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <baseboard/variants.h> #include <soc/smi.h> #include <soc/southbridge.h> diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c index 2164a03843..b1f03cb178 100644 --- a/src/soc/amd/common/agesawrapper.c +++ b/src/soc/amd/common/agesawrapper.c @@ -13,13 +13,13 @@ * GNU General Public License for more details. */ -#include "agesawrapper.h" +#include <amdblocks/agesawrapper.h> #include <arch/early_variables.h> #include <cbfs.h> #include <cbmem.h> #include <delay.h> #include <cpu/x86/mtrr.h> -#include <BiosCallOuts.h> +#include <amdblocks/BiosCallOuts.h> #include <string.h> #include <timestamp.h> diff --git a/src/soc/amd/common/amd_late_init.c b/src/soc/amd/common/amd_late_init.c index 3aee23ca7e..65667b9bdc 100644 --- a/src/soc/amd/common/amd_late_init.c +++ b/src/soc/amd/common/amd_late_init.c @@ -20,8 +20,8 @@ #include <device/pci_def.h> #include <device/pci_ops.h> -#include <agesawrapper.h> -#include <agesawrapper_call.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/agesawrapper_call.h> static void agesawrapper_post_device(void *unused) { diff --git a/src/soc/amd/common/BiosCallOuts.h b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h index 5237d52b6a..2302889e6b 100644 --- a/src/soc/amd/common/BiosCallOuts.h +++ b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h @@ -17,7 +17,7 @@ #ifndef __CALLOUTS_AMD_AGESA_H__ #define __CALLOUTS_AMD_AGESA_H__ -#include "agesawrapper.h" +#include <amdblocks/agesawrapper.h> #define BIOS_HEAP_START_ADDRESS 0x010000000 #define BIOS_HEAP_SIZE 0x30000 diff --git a/src/soc/amd/common/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h index 08ac5968ca..08ac5968ca 100644 --- a/src/soc/amd/common/agesawrapper.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h diff --git a/src/soc/amd/common/agesawrapper_call.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h index 01e2620961..4854bee80d 100644 --- a/src/soc/amd/common/agesawrapper_call.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h @@ -14,7 +14,7 @@ #ifndef __AGESAWRAPPER_CALL_H__ #define __AGESAWRAPPER_CALL_H__ -#include "agesawrapper.h" +#include <amdblocks/agesawrapper.h> #include <stdint.h> #include <console/console.h> diff --git a/src/soc/amd/common/block/include/amdblocks/dimm_spd.h b/src/soc/amd/common/block/include/amdblocks/dimm_spd.h index e29edc59b7..60107c9ba4 100644 --- a/src/soc/amd/common/block/include/amdblocks/dimm_spd.h +++ b/src/soc/amd/common/block/include/amdblocks/dimm_spd.h @@ -16,7 +16,7 @@ #ifndef __DIMMSPD_H__ #define __DIMMSPD_H__ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <stddef.h> #include <stdint.h> diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h index 57ba64945b..4c9878a53e 100644 --- a/src/soc/amd/common/block/include/amdblocks/psp.h +++ b/src/soc/amd/common/block/include/amdblocks/psp.h @@ -16,7 +16,7 @@ #ifndef __AMD_PSP_H__ #define __AMD_PSP_H__ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <soc/pci_devs.h> #include <stdint.h> #include <compiler.h> diff --git a/src/soc/amd/common/def_callouts.c b/src/soc/amd/common/def_callouts.c index cc7f55675f..c05d4de8cc 100644 --- a/src/soc/amd/common/def_callouts.c +++ b/src/soc/amd/common/def_callouts.c @@ -19,9 +19,9 @@ #include <cpu/x86/mp.h> #include <timer.h> #include <amdlib.h> -#include <BiosCallOuts.h> -#include "agesawrapper.h" -#include <agesawrapper_call.h> +#include <amdblocks/BiosCallOuts.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/agesawrapper_call.h> #include <reset.h> #include <soc/southbridge.h> diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c index b99151487d..bda521f07f 100644 --- a/src/soc/amd/common/heapmanager.c +++ b/src/soc/amd/common/heapmanager.c @@ -12,10 +12,10 @@ */ -#include "agesawrapper.h" +#include <amdblocks/agesawrapper.h> #include <amdlib.h> #include <arch/acpi.h> -#include <BiosCallOuts.h> +#include <amdblocks/BiosCallOuts.h> #include <cbmem.h> #include <string.h> diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c index 87eccaa345..f6ac187353 100644 --- a/src/soc/amd/stoneyridge/BiosCallOuts.c +++ b/src/soc/amd/stoneyridge/BiosCallOuts.c @@ -17,12 +17,12 @@ #include <device/device.h> #include <device/pci_def.h> -#include <BiosCallOuts.h> +#include <amdblocks/BiosCallOuts.h> #include <soc/southbridge.h> #include <soc/pci_devs.h> #include <stdlib.h> -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <amdlib.h> #include <amdblocks/dimm_spd.h> #include "chip.h" diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock/bootblock.c index abe06fbd24..030c990c4b 100644 --- a/src/soc/amd/stoneyridge/bootblock/bootblock.c +++ b/src/soc/amd/stoneyridge/bootblock/bootblock.c @@ -22,8 +22,8 @@ #include <cpu/amd/amdfam15.h> #include <smp/node.h> #include <bootblock_common.h> -#include <agesawrapper.h> -#include <agesawrapper_call.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/agesawrapper_call.h> #include <soc/pci_devs.h> #include <soc/northbridge.h> #include <soc/southbridge.h> diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c index 8e4ab2ee88..8d6a8e46fe 100644 --- a/src/soc/amd/stoneyridge/chip.c +++ b/src/soc/amd/stoneyridge/chip.c @@ -24,8 +24,8 @@ #include <soc/northbridge.h> #include <soc/southbridge.h> #include <amdblocks/psp.h> -#include <agesawrapper.h> -#include <agesawrapper_call.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/agesawrapper_call.h> struct device_operations cpu_bus_ops = { .read_resources = DEVICE_NOOP, diff --git a/src/soc/amd/stoneyridge/imc.c b/src/soc/amd/stoneyridge/imc.c index f7eed205d0..5d883d99ba 100644 --- a/src/soc/amd/stoneyridge/imc.c +++ b/src/soc/amd/stoneyridge/imc.c @@ -15,7 +15,7 @@ #define __SIMPLE_DEVICE__ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <soc/imc.h> #include <arch/io.h> #include <device/device.h> diff --git a/src/soc/amd/stoneyridge/include/fchec.h b/src/soc/amd/stoneyridge/include/fchec.h index e5e9cfd888..80125ecaad 100644 --- a/src/soc/amd/stoneyridge/include/fchec.h +++ b/src/soc/amd/stoneyridge/include/fchec.h @@ -16,7 +16,7 @@ #ifndef __AMD_STONEY_FCHEC__ #define __AMD_STONEY_FCHEC__ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <soc/imc.h> void agesawrapper_fchecfancontrolservice(void); diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 3eb8e8dfe1..27b5388d2a 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -28,8 +28,8 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <agesawrapper.h> -#include <agesawrapper_call.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/agesawrapper_call.h> #include <soc/northbridge.h> #include <soc/southbridge.h> #include <soc/pci_devs.h> diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index 32dee5ab25..7c738adc95 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -24,8 +24,8 @@ #include <device/device.h> #include <chip.h> #include <program_loading.h> -#include <agesawrapper.h> -#include <agesawrapper_call.h> +#include <amdblocks/agesawrapper.h> +#include <amdblocks/agesawrapper_call.h> #include <soc/northbridge.h> #include <soc/southbridge.h> #include <amdblocks/psp.h> diff --git a/src/soc/amd/stoneyridge/smbus_spd.c b/src/soc/amd/stoneyridge/smbus_spd.c index acd907e55b..60274005ba 100644 --- a/src/soc/amd/stoneyridge/smbus_spd.c +++ b/src/soc/amd/stoneyridge/smbus_spd.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <agesawrapper.h> +#include <amdblocks/agesawrapper.h> #include <device/pci_def.h> #include <device/device.h> #include <soc/southbridge.h> diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c index cc93424870..f37bae77f8 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c @@ -41,7 +41,7 @@ ***************************************************************************/ // TODO This list needs to be pruned of anything that is not API #include "AGESA.h" -#include "agesawrapper.h" +#include <block/include/amdblocks/agesawrapper.h> #include "AcpiLib.h" #include "FchCommonCfg.h" #include "Fch.h" |