From d42b799a9ecc10d23e2581a1c6c02f3a2d4857a7 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 24 Sep 2017 08:20:51 +0300 Subject: AGESA: Fix OptionsIds.h include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix regression of IDS debugging after commit 1210026 AGESA buildsystem: Reduce include path exposure Mainboard directory was removed from libagesa includes path here, and this resulted with fam15tn and fam16kb using a template OptionsIds.h file under vendorcode/ instead. Add mainboard directory back to include path of libagesa and remove those (empty) template files. Change-Id: Iee4341a527b4c152269565cac85e52db44503ea6 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21661 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/vendorcode/amd/agesa/f12/Makefile.inc | 1 + src/vendorcode/amd/agesa/f12/Proc/IDS/OptionsIds.h | 79 ------------------- src/vendorcode/amd/agesa/f14/Makefile.inc | 1 + src/vendorcode/amd/agesa/f14/Proc/IDS/OptionsIds.h | 69 ---------------- src/vendorcode/amd/agesa/f15/Makefile.inc | 2 +- src/vendorcode/amd/agesa/f15/Proc/IDS/OptionsIds.h | 80 ------------------- src/vendorcode/amd/agesa/f15tn/Makefile.inc | 2 +- .../amd/agesa/f15tn/Proc/IDS/OptionsIds.h | 86 -------------------- src/vendorcode/amd/agesa/f16kb/Makefile.inc | 2 +- .../amd/agesa/f16kb/Proc/IDS/OptionsIds.h | 92 ---------------------- src/vendorcode/amd/cimx/rd890/Makefile.inc | 2 - src/vendorcode/amd/cimx/sb700/Makefile.inc | 2 - src/vendorcode/amd/cimx/sb800/Makefile.inc | 2 - src/vendorcode/amd/cimx/sb900/Makefile.inc | 2 - 14 files changed, 5 insertions(+), 417 deletions(-) delete mode 100644 src/vendorcode/amd/agesa/f12/Proc/IDS/OptionsIds.h delete mode 100644 src/vendorcode/amd/agesa/f14/Proc/IDS/OptionsIds.h delete mode 100644 src/vendorcode/amd/agesa/f15/Proc/IDS/OptionsIds.h delete mode 100644 src/vendorcode/amd/agesa/f15tn/Proc/IDS/OptionsIds.h delete mode 100644 src/vendorcode/amd/agesa/f16kb/Proc/IDS/OptionsIds.h (limited to 'src') diff --git a/src/vendorcode/amd/agesa/f12/Makefile.inc b/src/vendorcode/amd/agesa/f12/Makefile.inc index 3855d1d027..3445b29af3 100644 --- a/src/vendorcode/amd/agesa/f12/Makefile.inc +++ b/src/vendorcode/amd/agesa/f12/Makefile.inc @@ -36,6 +36,7 @@ AGESA_INC = -I$(src)/vendorcode/amd/include AGESA_INC += -I$(AGESA_ROOT) AGESA_INC += -I$(AGESA_ROOT)/../common AGESA_INC += -I$(AGESA_ROOT)/Include +AGESA_INC += -I$(src)/mainboard/$(MAINBOARDDIR) # OptionsIds.h BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) $(AGESA_AUTOINCLUDES) diff --git a/src/vendorcode/amd/agesa/f12/Proc/IDS/OptionsIds.h b/src/vendorcode/amd/agesa/f12/Proc/IDS/OptionsIds.h deleted file mode 100644 index 7b51dfb8f5..0000000000 --- a/src/vendorcode/amd/agesa/f12/Proc/IDS/OptionsIds.h +++ /dev/null @@ -1,79 +0,0 @@ -/* $NoKeywords:$ */ -/** - * @file - * - * IDS Option File - * - * This file is used to switch on/off IDS features. - * - * @xrefitem bom "File Content Label" "Release Content" - * @e project: AGESA - * @e sub-project: Core - * @e \$Revision: 44324 $ @e \$Date: 2010-12-22 17:16:51 +0800 (Wed, 22 Dec 2010) $ - */ -/***************************************************************************** - * - * Copyright (c) 2011, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ***************************************************************************/ -#ifndef _OPTION_IDS_H_ -#define _OPTION_IDS_H_ - -/** - * - * This file generates the defaults tables for the Integrated Debug Support - * Module. The documented build options are imported from a user controlled - * file for processing. The build options for the Integrated Debug Support - * Module are listed below: - * - * IDSOPT_IDS_ENABLED - * IDSOPT_ERROR_TRAP_ENABLED - * IDSOPT_CONTROL_ENABLED - * - * Warning: When you enable the IDSOPT_CONTROL_NV_TO_CMOS feature. - * please make the cmos region defined by IDS_OPT_CMOS_REGION_START & - * IDS_OPT_CMOS_REGION_END can be touched between IDS HOOK point - * IDS_CPU_Early_Override and IDS_BEFORE_AP_EARLY_HALT of BSP - * - * IDSOPT_CONTROL_NV_TO_CMOS - * IDS_OPT_CMOS_INDEX_PORT - * IDS_OPT_CMOS_DATA_PORT - * IDS_OPT_CMOS_REGION_START - * IDS_OPT_CMOS_REGION_END - * - * IDSOPT_TRACING_ENABLED - * IDSOPT_TRACE_BLD_CFG - * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED - * IDS_DEBUG_PORT - * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED - * IDSOPT_DEBUG_CODE_ENABLED - * IDSOPT_IDT_EXCEPTION_TRAP - * IDSOPT_C_OPTIMIZATION_DISABLED - * - **/ - -#endif diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc index d2e0dfcbce..0a1bc07bc4 100644 --- a/src/vendorcode/amd/agesa/f14/Makefile.inc +++ b/src/vendorcode/amd/agesa/f14/Makefile.inc @@ -36,6 +36,7 @@ AGESA_INC = -I$(src)/vendorcode/amd/include AGESA_INC += -I$(AGESA_ROOT) AGESA_INC += -I$(AGESA_ROOT)/../common AGESA_INC += -I$(AGESA_ROOT)/Include +AGESA_INC += -I$(src)/mainboard/$(MAINBOARDDIR) # OptionsIds.h BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) $(AGESA_AUTOINCLUDES) diff --git a/src/vendorcode/amd/agesa/f14/Proc/IDS/OptionsIds.h b/src/vendorcode/amd/agesa/f14/Proc/IDS/OptionsIds.h deleted file mode 100644 index c2a280f1b8..0000000000 --- a/src/vendorcode/amd/agesa/f14/Proc/IDS/OptionsIds.h +++ /dev/null @@ -1,69 +0,0 @@ -/* $NoKeywords:$ */ -/** - * @file - * - * IDS Option File - * - * This file is used to switch on/off IDS features. - * - * @xrefitem bom "File Content Label" "Release Content" - * @e project: AGESA - * @e sub-project: Core - * @e \$Revision: 38300 $ @e \$Date: 2010-09-21 22:55:23 +0800 (Tue, 21 Sep 2010) $ - */ -/* - ***************************************************************************** - * - * Copyright (c) 2011, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * *************************************************************************** - * - */ -#ifndef _OPTION_IDS_H_ -#define _OPTION_IDS_H_ - -/** - * - * This file generates the defaults tables for the Integrated Debug Support - * Module. The documented build options are imported from a user controlled - * file for processing. The build options for the Integrated Debug Support - * Module are listed below: - * - * IDSOPT_IDS_ENABLED - * IDSOPT_ERROR_TRAP_ENABLED - * IDSOPT_CONTROL_ENABLED - * IDSOPT_TRACING_ENABLED - * IDSOPT_TRACE_BLD_CFG - * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED - * IDS_DEBUG_PORT - * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED - * IDSOPT_DEBUG_CODE_ENABLED - * IDSOPT_C_OPTIMIZATION_DISABLED - * - **/ - -#endif diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc index a3f6bb46f7..0172621ed4 100644 --- a/src/vendorcode/amd/agesa/f15/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15/Makefile.inc @@ -25,6 +25,7 @@ AGESA_INC = -I$(src)/vendorcode/amd/include AGESA_INC += -I$(AGESA_ROOT) AGESA_INC += -I$(AGESA_ROOT)/../common AGESA_INC += -I$(AGESA_ROOT)/Include +AGESA_INC += -I$(src)/mainboard/$(MAINBOARDDIR) # OptionsIds.h BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) $(AGESA_AUTOINCLUDES) @@ -37,7 +38,6 @@ CFLAGS_x86_64 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing CPPFLAGS_x86_ANY = CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU # heapManager.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU/Family -CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/Common # CreateStruct.h CPPFLAGS_x86_32 += $(AGESA_INC) $(CPPFLAGS_x86_ANY) CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY) diff --git a/src/vendorcode/amd/agesa/f15/Proc/IDS/OptionsIds.h b/src/vendorcode/amd/agesa/f15/Proc/IDS/OptionsIds.h deleted file mode 100644 index 71bd917908..0000000000 --- a/src/vendorcode/amd/agesa/f15/Proc/IDS/OptionsIds.h +++ /dev/null @@ -1,80 +0,0 @@ -/* $NoKeywords:$ */ -/** - * @file - * - * IDS Option File - * - * This file is used to switch on/off IDS features. - * - * @xrefitem bom "File Content Label" "Release Content" - * @e project: AGESA - * @e sub-project: Core - * @e \$Revision: 44324 $ @e \$Date: 2010-12-22 02:16:51 -0700 (Wed, 22 Dec 2010) $ - */ -/***************************************************************************** - * - * Copyright (C) 2012 Advanced Micro Devices, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - ***************************************************************************/ -#ifndef _OPTION_IDS_H_ -#define _OPTION_IDS_H_ - -/** - * - * This file generates the defaults tables for the Integrated Debug Support - * Module. The documented build options are imported from a user controlled - * file for processing. The build options for the Integrated Debug Support - * Module are listed below: - * - * IDSOPT_IDS_ENABLED - * IDSOPT_ERROR_TRAP_ENABLED - * IDSOPT_CONTROL_ENABLED - * - * Warning: When you enable the IDSOPT_CONTROL_NV_TO_CMOS feature. - * please make the cmos region defined by IDS_OPT_CMOS_REGION_START & - * IDS_OPT_CMOS_REGION_END can be touched between IDS HOOK point - * IDS_CPU_Early_Override and IDS_BEFORE_AP_EARLY_HALT of BSP - * - * IDSOPT_CONTROL_NV_TO_CMOS - * IDS_OPT_CMOS_INDEX_PORT - * IDS_OPT_CMOS_DATA_PORT - * IDS_OPT_CMOS_REGION_START - * IDS_OPT_CMOS_REGION_END - * - * IDSOPT_TRACING_ENABLED - * IDSOPT_TRACE_BLD_CFG - * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED - * IDS_DEBUG_PORT - * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED - * IDSOPT_DEBUG_CODE_ENABLED - * IDSOPT_IDT_EXCEPTION_TRAP - * IDSOPT_C_OPTIMIZATION_DISABLED - * - **/ - -#endif diff --git a/src/vendorcode/amd/agesa/f15tn/Makefile.inc b/src/vendorcode/amd/agesa/f15tn/Makefile.inc index 40efe60a5b..c5d1eee30b 100644 --- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc @@ -36,6 +36,7 @@ AGESA_INC = -I$(src)/vendorcode/amd/include AGESA_INC += -I$(AGESA_ROOT) AGESA_INC += -I$(AGESA_ROOT)/../common AGESA_INC += -I$(AGESA_ROOT)/Include +AGESA_INC += -I$(src)/mainboard/$(MAINBOARDDIR) # OptionsIds.h BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) $(AGESA_AUTOINCLUDES) @@ -47,7 +48,6 @@ CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno CPPFLAGS_x86_ANY = CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU # heapManager.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU/Family -CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/IDS # OptionsIds.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/Fch # FchPlatform.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/Fch/Common # FchCommonCfg.h diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/OptionsIds.h b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/OptionsIds.h deleted file mode 100644 index 287fde1b1c..0000000000 --- a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/OptionsIds.h +++ /dev/null @@ -1,86 +0,0 @@ -/* $NoKeywords:$ */ -/** - * @file - * - * IDS Option File - * - * This file is used to switch on/off IDS features. - * - * @xrefitem bom "File Content Label" "Release Content" - * @e project: AGESA - * @e sub-project: Core - * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ - */ -/***************************************************************************** - * - * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ***************************************************************************/ -#ifndef _OPTION_IDS_H_ -#define _OPTION_IDS_H_ - -/** - * - * This file generates the defaults tables for the Integrated Debug Support - * Module. The documented build options are imported from a user controlled - * file for processing. The build options for the Integrated Debug Support - * Module are listed below: - * - * IDSOPT_IDS_ENABLED - * IDSOPT_ERROR_TRAP_ENABLED - * IDSOPT_CONTROL_ENABLED - * - * Warning: When you enable the IDSOPT_CONTROL_NV_TO_CMOS feature. - * please make the cmos region defined by IDS_OPT_CMOS_REGION_START & - * IDS_OPT_CMOS_REGION_END can be touched between IDS HOOK point - * IDS_CPU_Early_Override and IDS_BEFORE_AP_EARLY_HALT of BSP - * - * IDSOPT_CONTROL_NV_TO_CMOS - * IDS_OPT_CMOS_INDEX_PORT - * IDS_OPT_CMOS_DATA_PORT - * IDS_OPT_CMOS_REGION_START - * IDS_OPT_CMOS_REGION_END - * - * IDSOPT_TRACING_ENABLED - * IDSOPT_CUSTOMIZE_TRACING_SERVICE - * - * IDSOPT_TRACING_CONSOLE_HDTOUT - * IDSOPT_TRACING_CONSOLE_SERIALPORT - * IDSOPT_SERIAL_PORT (default 0x3F8) - * IDSOPT_TRACING_CONSOLE_REDIRECT_IO - * IDSOPT_DEBUG_PRINT_IO_PORT (default 0x80) - * IDSOPT_TRACE_BLD_CFG - * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED - * IDS_DEBUG_PORT - * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED - * IDSOPT_DEBUG_CODE_ENABLED - * IDSOPT_IDT_EXCEPTION_TRAP - * IDSOPT_C_OPTIMIZATION_DISABLED - * - **/ - -#endif diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc index 31faea1d23..3837d8e93c 100644 --- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc +++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc @@ -36,6 +36,7 @@ AGESA_INC = -I$(src)/vendorcode/amd/include AGESA_INC += -I$(AGESA_ROOT) AGESA_INC += -I$(AGESA_ROOT)/../common AGESA_INC += -I$(AGESA_ROOT)/Include +AGESA_INC += -I$(src)/mainboard/$(MAINBOARDDIR) # OptionsIds.h BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) $(AGESA_AUTOINCLUDES) @@ -47,7 +48,6 @@ CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno CPPFLAGS_x86_ANY = CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU # heapManager.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU/Family -CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/IDS # OptionsIds.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/Fch # FchPlatform.h CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/Fch/Common # FchCommonCfg.h diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/OptionsIds.h b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/OptionsIds.h deleted file mode 100644 index 10c2e4acd5..0000000000 --- a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/OptionsIds.h +++ /dev/null @@ -1,92 +0,0 @@ -/* $NoKeywords:$ */ -/** - * @file - * - * IDS Option File - * - * This file is used to switch on/off IDS features. - * - * @xrefitem bom "File Content Label" "Release Content" - * @e project: AGESA - * @e sub-project: Core - * @e \$Revision: 84150 $ @e \$Date: 2012-12-12 15:46:25 -0600 (Wed, 12 Dec 2012) $ - */ -/***************************************************************************** - * - * Copyright (c) 2008 - 2013, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ***************************************************************************/ -#ifndef _OPTION_IDS_H_ -#define _OPTION_IDS_H_ - -/** - * - * This file generates the defaults tables for the Integrated Debug Support - * Module. The documented build options are imported from a user controlled - * file for processing. The build options for the Integrated Debug Support - * Module are listed below: - * - * IDSOPT_IDS_ENABLED - * IDSOPT_ERROR_TRAP_ENABLED - * IDSOPT_CONTROL_ENABLED - * - * Warning: When you enable the IDSOPT_CONTROL_NV_TO_CMOS feature. - * please make the cmos region defined by IDS_OPT_CMOS_REGION_START & - * IDS_OPT_CMOS_REGION_END can be touched between IDS HOOK point - * IDS_CPU_Early_Override and IDS_BEFORE_AP_EARLY_HALT of BSP - * - * IDSOPT_CONTROL_NV_TO_CMOS - * IDS_OPT_CMOS_INDEX_PORT - * IDS_OPT_CMOS_DATA_PORT - * IDS_OPT_CMOS_REGION_START - * IDS_OPT_CMOS_REGION_END - * - * IDSOPT_TRACING_ENABLED - * IDSOPT_TRACING_CONSOLE_HDTOUT - * IDSOPT_TRACING_CONSOLE_SERIALPORT - * IDSOPT_SERIAL_PORT (default 0x3F8) - * IDSOPT_TRACING_CONSOLE_REDIRECT_IO - * IDSOPT_DEBUG_PRINT_IO_PORT (default 0x80) - * IDSOPT_TRACING_CONSOLE_RAM - * IDSOPT_DPRAM_BASE - * IDSOPT_DPRAM_SIZE - * IDSOPT_DPRAM_STOP_LOGGING_WHEN_BUFFER_FULL (default FALSE) - * IDSOPT_CUSTOMIZE_TRACING_SERVICE - * IDSOPT_CUSTOMIZE_TRACING_SERVICE_INIT - * IDSOPT_CUSTOMIZE_TRACING_SERVICE_EXIT - * - * IDSOPT_TRACE_BLD_CFG - * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED - * IDS_DEBUG_PORT - * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED - * IDSOPT_DEBUG_CODE_ENABLED - * IDSOPT_IDT_EXCEPTION_TRAP - * IDSOPT_C_OPTIMIZATION_DISABLED - * - **/ - -#endif diff --git a/src/vendorcode/amd/cimx/rd890/Makefile.inc b/src/vendorcode/amd/cimx/rd890/Makefile.inc index 7ce625a9d9..670d26c5e8 100644 --- a/src/vendorcode/amd/cimx/rd890/Makefile.inc +++ b/src/vendorcode/amd/cimx/rd890/Makefile.inc @@ -27,12 +27,10 @@ # #***************************************************************************** -CPPFLAGS_x86_32 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_32 += -I$(src)/northbridge/amd/cimx/rd890 CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/rd890 -CPPFLAGS_x86_64 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_64 += -I$(src)/northbridge/amd/cimx/rd890 CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/rd890 diff --git a/src/vendorcode/amd/cimx/sb700/Makefile.inc b/src/vendorcode/amd/cimx/sb700/Makefile.inc index 760423333b..1d7ccd1494 100644 --- a/src/vendorcode/amd/cimx/sb700/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb700/Makefile.inc @@ -27,12 +27,10 @@ # #***************************************************************************** -CPPFLAGS_x86_32 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_32 += -I$(src)/southbridge/amd/cimx/sb700 CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/sb700 -CPPFLAGS_x86_64 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_64 += -I$(src)/southbridge/amd/cimx/sb700 CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/sb700 diff --git a/src/vendorcode/amd/cimx/sb800/Makefile.inc b/src/vendorcode/amd/cimx/sb800/Makefile.inc index 9090ecbd48..d7cf136e11 100644 --- a/src/vendorcode/amd/cimx/sb800/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb800/Makefile.inc @@ -13,12 +13,10 @@ # GNU General Public License for more details. # -CPPFLAGS_x86_32 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_32 += -I$(src)/southbridge/amd/cimx/sb800 CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/sb800 -CPPFLAGS_x86_64 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_64 += -I$(src)/southbridge/amd/cimx/sb800 CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/sb800 diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc index c20f06276a..f82e674c84 100644 --- a/src/vendorcode/amd/cimx/sb900/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc @@ -13,12 +13,10 @@ # GNU General Public License for more details. # -CPPFLAGS_x86_32 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_32 += -I$(src)/southbridge/amd/cimx/sb900 CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/sb900 -CPPFLAGS_x86_64 += -I$(src)/mainboard/$(MAINBOARDDIR) CPPFLAGS_x86_64 += -I$(src)/southbridge/amd/cimx/sb900 CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/sb900 -- cgit v1.2.3