[coreboot] Patch set updated: 45df6e2 Add xhcbios and ahcibios rom handling

[Frank Vibrans III (frank.vibrans@amd.com)]

Frank Vibrans III (frank.vibrans at amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/109

-gerrit

commit 45df6e248dd83ecb5b6198dc94d2b88056ac3612
Author: efdesign98 <efdesign98 at gmail.com>
Date:   Wed Jul 20 19:59:22 2011 -0600

    Add xhcbios and ahcibios rom handling
    
    This change adds xhci and ahci bios rom handling that
    is similar to the vgabios rom handling in the arch/x86
    Makefile.inc to the Persimmon and Torpedo mainboards.
    It also adds the basis for AHCI BIOS rom handling to
    the Persimmon Kconfig.
    
    Change-Id: I527a906323ae483cfa2ca0785f3adb43e88fd84b
    Signed-off-by: Frank Vibrans <frank.vibrans at amd.com>
    Signed-off-by: efdesign98 <efdesign98 at gmail.com>
---
 src/mainboard/amd/persimmon/Kconfig      |   14 ++++++++++++++
 src/mainboard/amd/persimmon/Makefile.inc |    7 +++++++
 src/mainboard/amd/torpedo/Makefile.inc   |   14 ++++++++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
old mode 100644
new mode 100755
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 034984c..c4eac67 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -119,6 +119,20 @@ config VGA_BIOS_ID
         string
         default "1002,9802"
 
+config AHCI_BIOS
+	bool
+	default n
+
+#config AHCI_BIOS_FILE
+#	string "AHCI ROM path and filename"
+#	depends on AHCI_BIOS
+#	default "rom/ahci/sb900.bin"
+
+config AHCI_BIOS_ID
+	string "AHCI device PCI IDs"
+	depends on AHCI_BIOS
+	default "1002,4391"
+
 config DRIVERS_PS2_KEYBOARD
 	bool
 	default n
diff --git a/src/mainboard/amd/persimmon/Makefile.inc b/src/mainboard/amd/persimmon/Makefile.inc
index 0f17032..de3564a 100644
--- a/src/mainboard/amd/persimmon/Makefile.inc
+++ b/src/mainboard/amd/persimmon/Makefile.inc
@@ -17,6 +17,13 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+ifeq ($(CONFIG_AHCI_BIOS),y)
+stripped_ahcibios_id = $(call strip_quotes,$(CONFIG_AHCI_BIOS_ID))
+cbfs-files-$(CONFIG_AHCI_BIOS) += pci$(stripped_ahcibios_id).rom
+pci$(stripped_ahcibios_id).rom-file := $(call strip_quotes,$(CONFIG_AHCI_BIOS_FILE))
+pci$(stripped_ahcibios_id).rom-type := optionrom
+endif
+
 romstage-y += buildOpts.c
 romstage-y += agesawrapper.c
 romstage-y += dimmSpd.c
diff --git a/src/mainboard/amd/torpedo/Makefile.inc b/src/mainboard/amd/torpedo/Makefile.inc
index 051d936..1a7dc95 100755
--- a/src/mainboard/amd/torpedo/Makefile.inc
+++ b/src/mainboard/amd/torpedo/Makefile.inc
@@ -17,6 +17,20 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+ifeq ($(CONFIG_AHCI_BIOS),y)
+stripped_ahcibios_id = $(call strip_quotes,$(CONFIG_AHCI_BIOS_ID))
+cbfs-files-$(CONFIG_AHCI_BIOS) += pci$(stripped_ahcibios_id).rom
+pci$(stripped_ahcibios_id).rom-file := $(call strip_quotes,$(CONFIG_AHCI_BIOS_FILE))
+pci$(stripped_ahcibios_id).rom-type := optionrom
+endif
+
+ifeq ($(CONFIG_XHC_BIOS),y)
+stripped_xhcbios_id = $(call strip_quotes,$(CONFIG_XHC_BIOS_ID))
+cbfs-files-$(CONFIG_XHC_BIOS) += pci$(stripped_xhcbios_id).rom
+pci$(stripped_xhcbios_id).rom-file := $(call strip_quotes,$(CONFIG_XHC_BIOS_FILE))
+pci$(stripped_xhcbios_id).rom-type := optionrom
+endif
+
 romstage-y += buildOpts.c
 romstage-y += agesawrapper.c
 romstage-y += dimmSpd.c