summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorefdesign98 <efdesign98@gmail.com>2011-07-20 19:59:22 -0600
committerMarc Jones <marcj303@gmail.com>2011-07-22 20:02:22 +0200
commit3ddb6b85f17d4adc832c319fcba25f7857d70ccd (patch)
tree7a14fb611bb798339860ca090333fd9bceeba16b /src
parent95b6611c18adc8aee9381ebdaf94e99e116db417 (diff)
downloadcoreboot-3ddb6b85f17d4adc832c319fcba25f7857d70ccd.tar.xz
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@amd.com> Signed-off-by: efdesign98 <efdesign98@gmail.com> Reviewed-on: http://review.coreboot.org/109 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/arch/x86/Makefile.inc0
-rw-r--r--src/mainboard/amd/persimmon/Kconfig14
-rw-r--r--src/mainboard/amd/persimmon/Makefile.inc7
-rwxr-xr-xsrc/mainboard/amd/torpedo/Makefile.inc14
4 files changed, 35 insertions, 0 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index e9c00deac3..e9c00deac3 100644..100755
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 034984c80f..c4eac67ea4 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 0f17032e4c..de3564ac3a 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 051d93668f..1a7dc95311 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