From cd25ca09f049a8c9cf3311c1bd373195e4ddde5b Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Wed, 15 Feb 2023 10:11:46 +0800 Subject: [PATCH] amdfwtool: Remove the limit of spliting EFS and body To support 32M flash, the non-vboot also need to split amdfw. Just as the deleted comment says, we need this feature now. This is one of series of patches to support 32/64M flash. BUG=b:255374782 Change-Id: Ic058cfaeebd1a947227cfa9be2db4eb22702aa28 Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/69857 Tested-by: build bot (Jenkins) Reviewed-by: Fred Reitberger --- util/amdfwtool/amdfwtool.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 4c570be5df..edac06aba8 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -2423,17 +2423,6 @@ int main(int argc, char **argv) return 1; } - /* - * On boards using vboot, there can be more than one instance of EFS + AMDFW Body. - * For the instance in the RO section, there is no need to split EFS + AMDFW body - * currently. This condition is to ensure that it is not accidentally split. Revisit - * this condition if such a need arises in the future. - */ - if (!any_location && body_location != efs_location) { - fprintf(stderr, "Error: EFS cannot be separate from AMDFW Body.\n"); - return 1; - } - if (body_location != efs_location && body_location < ALIGN(efs_location + sizeof(embedded_firmware), BLOB_ALIGNMENT)) { fprintf(stderr, "Error: Insufficient space between EFS and Blobs.\n");