[coreboot-gerrit] New patch to review for coreboot: amd: hudson: Fix position of hudson_fwm

[Ricardo Ribalda Delgado]

Ricardo Ribalda Delgado just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17925

-gerrit

commit 884d20521372af8038a418bdcd824375d5a2d1e4
Author: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
Date:   Tue Dec 20 10:51:08 2016 +0100

    amd: hudson: Fix position of hudson_fwm
    
    AMDFWTOOL calculates the location of the amdfw based on the
    CONFIG_ROM_SIZE. If HUDSON_FWM_POSITION does not match that location the
    resulting rom does not boot.
    
    On this patch we force the position of HUDSON_FWM_POSITION to the
    position calculated by amdfwrom.
    
    Change-Id: Id2ee96ee076293d48ade84fd6e976ca994dcf491
---
 src/southbridge/amd/agesa/hudson/Kconfig      | 23 -----------------------
 src/southbridge/amd/agesa/hudson/Makefile.inc |  3 +--
 src/southbridge/amd/pi/hudson/Kconfig         | 23 -----------------------
 src/southbridge/amd/pi/hudson/Makefile.inc    |  3 +--
 4 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index eed83ae..91ebe03 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -101,29 +101,6 @@ config HUDSON_FWM
 	default y if HUDSON_XHCI_FWM || HUDSON_IMC_FWM || HUDSON_GEC_FWM
 	default n
 
-if HUDSON_FWM
-
-config HUDSON_FWM_POSITION
-	hex "Hudson Firmware ROM Position"
-	default 0xFFF20000 if BOARD_ROMSIZE_KB_1024
-	default 0xFFE20000 if BOARD_ROMSIZE_KB_2048
-	default 0xFFC20000 if BOARD_ROMSIZE_KB_4096
-	default 0xFF820000 if BOARD_ROMSIZE_KB_8192
-	default 0xFF020000 if BOARD_ROMSIZE_KB_16384
-	help
-	  Hudson requires the firmware MUST be located at
-	  a specific address (ROM start address + 0x20000), otherwise
-	  xhci host Controller can not find or load the xhci firmware.
-
-	  The firmware start address is dependent on the ROM chip size.
-	  The default offset is 0x20000 from the ROM start address, namely
-	  0xFFF20000 if flash chip size is 1M
-	  0xFFE20000 if flash chip size is 2M
-	  0xFFC20000 if flash chip size is 4M
-	  0xFF820000 if flash chip size is 8M
-	  0xFF020000 if flash chip size is 16M
-endif # HUDSON_FWM
-
 config HUDSON_SATA_MODE
 	int "SATA Mode"
 	default 0
diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc
index 2e8b13b..7595889 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -35,8 +35,7 @@ ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c smi_util.c
 # +-----------+---------------+----------------+------------+
 # EC ROM should be 64K aligned.
 
-HUDSON_FWM_POS_CALC=$(call int-add, $(call int-subtract, 0xffffffff $(call int-multiply, $(CONFIG_COREBOOT_ROMSIZE_KB) 1024)) 0x20000 1)
-HUDSON_FWM_POSITION=$(shell printf %u $(CONFIG_HUDSON_FWM_POSITION))
+HUDSON_FWM_POSITION=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_ROM_SIZE)) 0x20000 1)
 
 ifdef CONFIG_HUDSON_AHCI_ROM
 stripped_ahci_rom_id = $(call strip_quotes,$(CONFIG_AHCI_ROM_ID))
diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index afa03aa..f6e3355 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -103,29 +103,6 @@ config HUDSON_FWM
 	default y if HUDSON_XHCI_FWM || HUDSON_IMC_FWM || HUDSON_GEC_FWM || HUDSON_PSP
 	default n
 
-if HUDSON_FWM
-
-config HUDSON_FWM_POSITION
-	hex "Hudson Firmware ROM Position"
-	default 0xFFF20000 if BOARD_ROMSIZE_KB_1024
-	default 0xFFE20000 if BOARD_ROMSIZE_KB_2048
-	default 0xFFC20000 if BOARD_ROMSIZE_KB_4096
-	default 0xFF820000 if BOARD_ROMSIZE_KB_8192
-	default 0xFF020000 if BOARD_ROMSIZE_KB_16384
-	help
-	  Hudson requires the firmware MUST be located at
-	  a specific address (ROM start address + 0x20000), otherwise
-	  xhci host Controller can not find or load the xhci firmware.
-
-	  The firmware start address is dependent on the ROM chip size.
-	  The default offset is 0x20000 from the ROM start address, namely
-	  0xFFF20000 if flash chip size is 1M
-	  0xFFE20000 if flash chip size is 2M
-	  0xFFC20000 if flash chip size is 4M
-	  0xFF820000 if flash chip size is 8M
-	  0xFF020000 if flash chip size is 16M
-endif # HUDSON_FWM
-
 config AMD_PUBKEY_FILE
 	depends on HUDSON_PSP
 	string "AMD public Key"
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 292da76..24a757c 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -67,8 +67,7 @@ ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c smi_util.c
 #
 # EC ROM should be 64K aligned.
 
-HUDSON_FWM_POS_CALC=$(call int-add, $(call int-subtract, 0xffffffff $(call int-multiply, $(CONFIG_COREBOOT_ROMSIZE_KB) 1024)) 0x20000 1)
-HUDSON_FWM_POSITION=$(shell printf %u $(CONFIG_HUDSON_FWM_POSITION))
+HUDSON_FWM_POSITION=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_ROM_SIZE)) 0x20000 1)
 
 ##
 ifeq ($(CONFIG_HUDSON_PSP), y)