New patch to review for coreboot: e8b0756 AMD Hudson: Disable the binary blobs requirement

[Martin Roth]

Martin Roth ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2415

-gerrit

commit e8b07560c4b6506f3dd86f405d8f2007e06aae79
Author: Martin Roth 
Date:   Fri Feb 15 13:45:43 2013 -0700

AMD Hudson: Disable the binary blobs requirement

Enabling the binary blobs repository is an artificial requirement
    and is keeping me from building my system when I have my config
    pointed to roms that are not in the binary blobs repo anyway.

This change removes the binary blobs requirement for hudson and
    gives better feedback about the files when they are missing from
    the build.

Change-Id: Id080905928848a239a992ce6604ea75d00081a8f
    Signed-off-by: Martin Roth 
---
 src/southbridge/amd/agesa/hudson/Kconfig      |  3 --
 src/southbridge/amd/agesa/hudson/Makefile.inc | 48 +++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index 92e5960..6cbed53 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -46,21 +46,18 @@ if SOUTHBRIDGE_AMD_AGESA_HUDSON
 config HUDSON_XHCI_FWM
    bool "Add xhci firmware"
    default y
-	select REQUIRES_BLOB
         help
      Add Hudson 2/3/4 XHCI Firmware to support the onboard usb3.0

config HUDSON_IMC_FWM
    bool "Add imc firmware"
    default y
-	select REQUIRES_BLOB
         help
      Add Hudson 2/3/4 IMC Firmware to support the onboard fan control

config HUDSON_GEC_FWM
    bool "Add gec firmware"
    default n
-	select REQUIRES_BLOB
         help
      Add Hudson 2/3/4 GEC Firmware

diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc
index c9a1731..085c64b 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -74,6 +74,17 @@ cbfs-files-y += hudson/xhci
 hudson/xhci-file := $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE))
 hudson/xhci-position := $(HUDSON_XHCI_POSITION)
 hudson/xhci-type := raw
+
+# check to see if the XHCI firmware exists
+$(call strip_quotes,$(CONFIG_HUDSON_XHCI_FWM_FILE)):
+	$(info )
+	$(info ###########################################################################)
+	$(info # ERROR: The XHCI firmware file specified does not exist:)
+	$(info # $(CONFIG_HUDSON_XHCI_FWM_FILE) )
+	$(info # Please enable binary blobs or configure a valid XHCI firmware path.)
+	$(info ###########################################################################)
+	$(info )
+	__XHCI_FIRMWARE_ERROR___END_BUILD__
 endif

ifeq ($(CONFIG_HUDSON_IMC_FWM), y)
@@ -81,6 +92,17 @@ cbfs-files-y += hudson/imc
 hudson/imc-file := $(call strip_quotes, $(CONFIG_HUDSON_IMC_FWM_FILE))
 hudson/imc-position := $(HUDSON_IMC_POSITION)
 hudson/imc-type := raw
+
+# check to see if the IMC firmware exists
+$(call strip_quotes,$(CONFIG_HUDSON_IMC_FWM_FILE)):
+	$(info )
+	$(info ###########################################################################)
+	$(info # ERROR: The IMC firmware file specified does not exist:)
+	$(info # $(CONFIG_HUDSON_IMC_FWM_FILE) )
+	$(info # Please enable binary blobs or config a valid IMC firmware path.)
+	$(info ###########################################################################)
+	$(info )
+	__IMC_FIRMWARE_ERROR___END_BUILD__
 endif

ifeq ($(CONFIG_HUDSON_GEC_FWM), y)
@@ -88,13 +110,35 @@ cbfs-files-y += hudson/gec
 hudson/gec-file := $(call strip_quotes, $(CONFIG_HUDSON_GEC_FWM_FILE))
 hudson/gec-position := $(HUDSON_GEC_POSITION)
 hudson/gec-type := raw
+
+# check to see if the GEC firmware exists
+$(call strip_quotes,$(CONFIG_HUDSON_GEC_FWM_FILE)):
+	$(info )
+	$(info ###########################################################################)
+	$(info # ERROR: The GEC firmware file specified does not exist:)
+	$(info # $(CONFIG_HUDSON_GEC_FWM_FILE) )
+	$(info # Please configure a valid GEC firmware path. If you don't have)
+	$(info # this file, it may be obtained from your AMD representative.)
+	$(info ###########################################################################)
+	$(info )
+	__GEC_FIRMWARE_ERROR___END_BUILD__
 endif

-#ifeq ($(CONFIG_HUDSON_SATA_AHCI), y)
 ifdef CONFIG_HUDSON_AHCI_ROM
 stripped_ahci_rom_id = $(call strip_quotes,$(CONFIG_AHCI_ROM_ID))
 cbfs-files-y += pci$(stripped_ahci_rom_id).rom
 pci$(stripped_ahci_rom_id).rom-file := $(call strip_quotes,$(CONFIG_AHCI_ROM_FILE))
 pci$(stripped_ahci_rom_id).rom-type := optionrom
-#endif
+
+# check to see if the AHCI rom exists
+$(call strip_quotes,$(CONFIG_AHCI_ROM_FILE)):
+	$(info )
+	$(info ###########################################################################)
+	$(info # ERROR: The AHCI rom specified does not exist:)
+	$(info # $(CONFIG_AHCI_ROM_FILE) )
+	$(info # Please configure a valid AHCI rom path.  If you don't have)
+	$(info # this file, it may be obtained from your AMD representative.)
+	$(info ###########################################################################)
+	$(info )
+	__AHCI_ROM_ERROR___END_BUILD__
 endif