diff options
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h | 8 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/s3_resume.h | 21 | ||||
| -rw-r--r-- | src/soc/amd/common/block/pi/heapmanager.c | 5 |
3 files changed, 1 insertions, 33 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h index 8a9474eb0d..e061c63463 100644 --- a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h +++ b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h @@ -18,18 +18,10 @@ #define __CALLOUTS_AMD_AGESA_H__ #include <amdblocks/agesawrapper.h> -#include <amdblocks/s3_resume.h> #define BIOS_HEAP_SIZE 0x30000 #define BSP_STACK_BASE_ADDR 0x30000 -struct cbmem_usage { - uint8_t heap_base[BIOS_HEAP_SIZE]; -#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) - uint8_t s3_vol_data[S3_VOLATILE_SIZE]; -#endif -}; - typedef struct _BIOS_HEAP_MANAGER { UINT32 StartOfAllocatedNodes; UINT32 StartOfFreedNodes; diff --git a/src/soc/amd/common/block/include/amdblocks/s3_resume.h b/src/soc/amd/common/block/include/amdblocks/s3_resume.h deleted file mode 100644 index 567b0a8c40..0000000000 --- a/src/soc/amd/common/block/include/amdblocks/s3_resume.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 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. - */ - -#ifndef __AMD_S3_RESUME_H__ -#define __AMD_S3_RESUME_H__ - -#define S3_VOLATILE_SIZE 0x6000 - -#endif /* __AMD_S3_RESUME_H__ */ diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c index 6b47ec3ac0..79c8403f3e 100644 --- a/src/soc/amd/common/block/pi/heapmanager.c +++ b/src/soc/amd/common/block/pi/heapmanager.c @@ -21,10 +21,7 @@ void *agesa_heap_base(void) { - struct cbmem_usage *heap; - heap = (struct cbmem_usage *)cbmem_add(CBMEM_ID_RESUME_SCRATCH, - sizeof(struct cbmem_usage)); - return &heap->heap_base; + return cbmem_add(CBMEM_ID_RESUME_SCRATCH, BIOS_HEAP_SIZE); } static void EmptyHeap(int unused) |