From a31bb0779ae5fc932f458cb82126bc87002c83b2 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 18 Jan 2012 09:43:52 +0100 Subject: [PATCH] Unify ID_SECTION_OFFSET and mark it deprecated We used to put the id section at -0x10, with some boards overriding this to avoid collisions with romstraps. Hardcode the location at -0x80, at the possible expense of some space (0x70 bytes). This also makes the section easier to find in a binary image. At some point, CONFIG_ID_SECTION_OFFSET can be removed, so this option is moved to src/Kconfig.deprecated_options. Change-Id: I6ce2d6e94e57717939bda070bfe0c9df80ca2a89 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/549 Tested-by: build bot (Jenkins) Reviewed-by: Peter Stuge --- src/Kconfig | 4 ---- src/Kconfig.deprecated_options | 4 ++++ src/mainboard/amd/serengeti_cheetah_fam10/Kconfig | 4 ---- src/mainboard/msi/ms9652_fam10/Kconfig | 4 ---- src/southbridge/nvidia/ck804/Kconfig | 4 ---- src/southbridge/nvidia/mcp55/Kconfig | 4 ---- src/southbridge/sis/sis966/Kconfig | 4 ---- src/southbridge/via/k8t890/Kconfig | 4 ---- 8 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 525d452f4..64c359e8d 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -883,10 +883,6 @@ config WARNINGS_ARE_ERRORS bool default y -config ID_SECTION_OFFSET - hex - default 0x10 - # The four POWER_BUTTON_DEFAULT_ENABLE, POWER_BUTTON_DEFAULT_DISABLE, # POWER_BUTTON_FORCE_ENABLE and POWER_BUTTON_FORCE_DISABLE options are # mutually exclusive. One of these options must be selected in the diff --git a/src/Kconfig.deprecated_options b/src/Kconfig.deprecated_options index d83525e54..3cfb5ddc3 100644 --- a/src/Kconfig.deprecated_options +++ b/src/Kconfig.deprecated_options @@ -61,4 +61,8 @@ config PCIE_TUNING This variable enables certain PCIe optimizations. Right now it's only ASPM and it's untested. +config ID_SECTION_OFFSET + hex + default 0x80 + endmenu diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index 0fc857bb8..feecdec4e 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -87,8 +87,4 @@ config RAMBASE hex default 0x200000 -config ID_SECTION_OFFSET - hex - default 0x80 - endif # BOARD_AMD_SERENGETI_CHEETAH_FAM10 diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index 71568d74c..17f050208 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -170,10 +170,6 @@ config AMD_UCODE_PATCH_FILE string default "mc_patch_01000096.h" -config ID_SECTION_OFFSET - hex - default 0x80 - config HT3_SUPPORT bool default y diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig index 88ab7ff1f..97927d7a1 100644 --- a/src/southbridge/nvidia/ck804/Kconfig +++ b/src/southbridge/nvidia/ck804/Kconfig @@ -10,10 +10,6 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT string default "southbridge/nvidia/ck804/bootblock.c" -config ID_SECTION_OFFSET - hex - default 0x80 - config EHCI_BAR hex default 0xfef00000 diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig index adca4bdf0..fc355cb9d 100644 --- a/src/southbridge/nvidia/mcp55/Kconfig +++ b/src/southbridge/nvidia/mcp55/Kconfig @@ -9,10 +9,6 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT string default "southbridge/nvidia/mcp55/bootblock.c" -config ID_SECTION_OFFSET - hex - default 0x80 - config EHCI_BAR hex default 0xfef00000 diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig index 909a7419b..3cee5b313 100644 --- a/src/southbridge/sis/sis966/Kconfig +++ b/src/southbridge/sis/sis966/Kconfig @@ -7,10 +7,6 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT string default "southbridge/sis/sis966/bootblock.c" if SOUTHBRIDGE_SIS_SIS966 -config ID_SECTION_OFFSET - hex - default 0x80 if SOUTHBRIDGE_SIS_SIS966 - config EHCI_BAR hex default 0xfef00000 if SOUTHBRIDGE_SIS_SIS966 diff --git a/src/southbridge/via/k8t890/Kconfig b/src/southbridge/via/k8t890/Kconfig index 94b62b0be..b23b84a55 100644 --- a/src/southbridge/via/k8t890/Kconfig +++ b/src/southbridge/via/k8t890/Kconfig @@ -50,7 +50,3 @@ config VIDEO_MB default -1 if K8M890_VIDEO_MB_CMOS depends on SOUTHBRIDGE_VIA_K8M890_VGA_EN -config ID_SECTION_OFFSET - hex - default 0x80 if SOUTHBRIDGE_VIA_K8M800 || SOUTHBRIDGE_VIA_K8T800_OLD || SOUTHBRIDGE_VIA_K8T800 || SOUTHBRIDGE_VIA_K8T800PRO || SOUTHBRIDGE_VIA_K8M890 || SOUTHBRIDGE_VIA_K8T890 - -- 2.25.1