From 9e9dccb89fe47af5f481b0c656399a61d5c4b79d Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 16 May 2022 16:09:59 +0200 Subject: arch/x86/car.ld: Remove AGESA linker warning workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that all AGESA codebases have been fixed to not use the .data section, the warning workaround can be disabled. Change-Id: I675d169a5d2f16e1e9ae05f95e045e9ef3d12208 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/64401 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Kyösti Mälkki Reviewed-by: Martin L Roth --- src/arch/x86/car.ld | 5 ----- src/northbridge/amd/agesa/Kconfig | 7 ------- src/northbridge/amd/agesa/family14/Kconfig | 3 --- src/northbridge/amd/agesa/family15tn/Kconfig | 3 --- src/northbridge/amd/agesa/family16kb/Kconfig | 3 --- 5 files changed, 21 deletions(-) diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld index 4e3383cf1e..331c256ece 100644 --- a/src/arch/x86/car.ld +++ b/src/arch/x86/car.ld @@ -115,13 +115,8 @@ _rom_mtrr_base = _rom_mtrr_mask; . = 0xffffff00; .illegal_globals . : { -#if CONFIG(AGESA_BROKEN_DATA_SECTION) - *(EXCLUDE_FILE ("*/libagesa.*.a:" "*/romstage*/buildOpts.o" "*/romstage*/agesawrapper.o" "*/vendorcode/amd/agesa/*" "*/vendorcode/amd/cimx/*") .data) - *(EXCLUDE_FILE ("*/libagesa.*.a:" "*/romstage*/buildOpts.o" "*/romstage*/agesawrapper.o" "*/vendorcode/amd/agesa/*" "*/vendorcode/amd/cimx/*") .data.*) -#else *(.data) *(.data.*) -#endif } _bogus = ASSERT((CONFIG_DCACHE_RAM_SIZE == 0) || (SIZEOF(.car.data) <= CONFIG_DCACHE_RAM_SIZE), "Cache as RAM area is too full"); diff --git a/src/northbridge/amd/agesa/Kconfig b/src/northbridge/amd/agesa/Kconfig index 3959284921..6f6e3d63a9 100644 --- a/src/northbridge/amd/agesa/Kconfig +++ b/src/northbridge/amd/agesa/Kconfig @@ -27,13 +27,6 @@ config S3_VGA_ROM_RUN source "src/northbridge/amd/agesa/*/Kconfig" -config AGESA_BROKEN_DATA_SECTION - bool - default y - help - Select this on AGESA platforms that incorrectly use the .data - section. - # TODO: Reservation for heap seems excessive config HEAP_SIZE hex diff --git a/src/northbridge/amd/agesa/family14/Kconfig b/src/northbridge/amd/agesa/family14/Kconfig index 0e5a2bea6b..941972b1a1 100644 --- a/src/northbridge/amd/agesa/family14/Kconfig +++ b/src/northbridge/amd/agesa/family14/Kconfig @@ -17,7 +17,4 @@ config ECAM_MMCONF_BASE_ADDRESS config ECAM_MMCONF_BUS_NUMBER default 64 -config AGESA_BROKEN_DATA_SECTION - default n - endif # NORTHBRIDGE_AMD_AGESA_FAMILY14 diff --git a/src/northbridge/amd/agesa/family15tn/Kconfig b/src/northbridge/amd/agesa/family15tn/Kconfig index e3a5cc64d0..5bb7cca300 100644 --- a/src/northbridge/amd/agesa/family15tn/Kconfig +++ b/src/northbridge/amd/agesa/family15tn/Kconfig @@ -17,7 +17,4 @@ config ECAM_MMCONF_BASE_ADDRESS config ECAM_MMCONF_BUS_NUMBER default 64 -config AGESA_BROKEN_DATA_SECTION - default n - endif # NORTHBRIDGE_AMD_AGESA_FAMILY15_TN diff --git a/src/northbridge/amd/agesa/family16kb/Kconfig b/src/northbridge/amd/agesa/family16kb/Kconfig index 01f542d585..8cf919a2d5 100644 --- a/src/northbridge/amd/agesa/family16kb/Kconfig +++ b/src/northbridge/amd/agesa/family16kb/Kconfig @@ -24,7 +24,4 @@ config VGA_BIOS_ID The default VGA BIOS PCI vendor/device ID should be set to the result of the map_oprom_vendev() function in northbridge.c. -config AGESA_BROKEN_DATA_SECTION - default n - endif # NORTHBRIDGE_AMD_AGESA_FAMILY16_KB -- cgit v1.2.3