Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6138
-gerrit
commit bd85e87679097517a81ef92e4edff9a8e3b5f6a8 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Fri Jun 27 16:55:50 2014 +1000
cpu/amd/agesa/s3_resume.c: Sanitize #includes
Alphabetize headers and remove any guarding.
Change-Id: I774c2891298cc9aebfd79f68601402b18898ffad Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/cpu/amd/agesa/s3_resume.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c index d51203e..f232753 100644 --- a/src/cpu/amd/agesa/s3_resume.c +++ b/src/cpu/amd/agesa/s3_resume.c @@ -17,28 +17,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <AGESA.h> -#include <Lib/amdlib.h> +#include <arch/acpi.h> +#include <arch/io.h> +#include <cbmem.h> #include <console/console.h> -#include <cpu/x86/msr.h> -#include <cpu/x86/mtrr.h> #include <cpu/amd/mtrr.h> #include <cpu/x86/cache.h> -#include <cbmem.h> +#include <cpu/x86/msr.h> +#include <cpu/x86/mtrr.h> #include <device/device.h> -#include <arch/io.h> -#include <arch/acpi.h> #include <string.h> +#include <spi-generic.h> +#include <spi_flash.h> + +#include <AGESA.h> +#include <Lib/amdlib.h> + #include "Porting.h" #include "BiosCallOuts.h" #include "s3_resume.h" #include "agesawrapper.h"
-#ifndef __PRE_RAM__ -#include <spi-generic.h> -#include <spi_flash.h> -#endif - void restore_mtrr(void) { u32 msr;