summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2015-08-11 17:52:03 -0500
committerMartin Roth <martinroth@google.com>2015-11-24 19:03:24 +0100
commitb174667534c327b8558ff04986a2c1a971b7f04e (patch)
tree8f41e82cb5b55cf77eeecd596530bbde9d580f2a
parent593f5c8a48043153963c04060ed8de7d60604bc1 (diff)
northbridge/amd/amdfam10: Rename mislabeled iommu nvram option to gart
Change-Id: Ia24102e164eb5753ade3f9b5ab21eba2fa60836b Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/12046 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/mainboard/advansus/a785e-i/cmos.layout2
-rw-r--r--src/mainboard/amd/bimini_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/mahogany_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/tilapia_fam10/cmos.layout2
-rw-r--r--src/mainboard/asus/kfsn4-dre/cmos.layout2
-rw-r--r--src/mainboard/asus/kgpe-d16/cmos.default2
-rw-r--r--src/mainboard/asus/kgpe-d16/cmos.layout2
-rw-r--r--src/mainboard/asus/m4a78-em/cmos.layout2
-rw-r--r--src/mainboard/asus/m4a785-m/cmos.layout2
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.default2
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.layout2
-rw-r--r--src/mainboard/asus/m5a88-v/cmos.layout2
-rw-r--r--src/mainboard/avalue/eax-785e/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ma785gm/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ma785gmt/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ma78gm/cmos.layout2
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/cmos.layout2
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/cmos.layout2
-rw-r--r--src/mainboard/jetway/pa78vm5/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9652_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2912_fam10/cmos.layout2
-rw-r--r--src/northbridge/amd/amdfam10/misc_control.c12
26 files changed, 31 insertions, 31 deletions
diff --git a/src/mainboard/advansus/a785e-i/cmos.layout b/src/mainboard/advansus/a785e-i/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/amd/bimini_fam10/cmos.layout b/src/mainboard/amd/bimini_fam10/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index 14e45ef914..3c0a4ed49d 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 1 e 1 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/mainboard/amd/tilapia_fam10/cmos.layout b/src/mainboard/amd/tilapia_fam10/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index 66bc3a0728..bd5fdbeb2f 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 1 e 1 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/mainboard/asus/kgpe-d16/cmos.default b/src/mainboard/asus/kgpe-d16/cmos.default
index 9994dadd75..024d263272 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.default
+++ b/src/mainboard/asus/kgpe-d16/cmos.default
@@ -3,7 +3,7 @@ debug_level = Spew
multi_core = Enable
slow_cpu = off
compute_unit_siblings = Enable
-iommu = Disable
+gart = Disable
nmi = Disable
hypertransport_speed_limit = Auto
max_mem_clock = DDR3-1600
diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout
index e17fec6b90..b144347f9f 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 2 e 3 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/mainboard/asus/m4a78-em/cmos.layout b/src/mainboard/asus/m4a78-em/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/m4a785-m/cmos.layout b/src/mainboard/asus/m4a785-m/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/m4a785t-m/cmos.default b/src/mainboard/asus/m4a785t-m/cmos.default
index 1686102078..f336bd3607 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.default
+++ b/src/mainboard/asus/m4a785t-m/cmos.default
@@ -9,4 +9,4 @@ power_on_after_fail=Disable
debug_level=Spew
slow_cpu=off
nmi=Enable
-iommu=Enable
+gart=Enable
diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/m5a88-v/cmos.layout b/src/mainboard/asus/m5a88-v/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/avalue/eax-785e/cmos.layout b/src/mainboard/avalue/eax-785e/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/gigabyte/ma785gm/cmos.layout b/src/mainboard/gigabyte/ma785gm/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/gigabyte/ma785gmt/cmos.layout b/src/mainboard/gigabyte/ma785gmt/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/gigabyte/ma78gm/cmos.layout b/src/mainboard/gigabyte/ma78gm/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
index 73d53af3d5..5602c70f12 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
728 256 h 0 user_data
diff --git a/src/mainboard/iei/kino-780am2-fam10/cmos.layout b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/jetway/pa78vm5/cmos.layout b/src/mainboard/jetway/pa78vm5/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/jetway/pa78vm5/cmos.layout
+++ b/src/mainboard/jetway/pa78vm5/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index 14e45ef914..3c0a4ed49d 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 1 e 1 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index 14e45ef914..3c0a4ed49d 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 1 e 1 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index 14e45ef914..3c0a4ed49d 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 1 e 1 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/mainboard/supermicro/h8scm_fam10/cmos.layout b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
index 0ad18a254b..bf58aac890 100644
--- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
@@ -12,7 +12,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
456 1 e 1 ECC_memory
728 256 h 0 user_data
984 16 h 0 check_sum
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index 14e45ef914..3c0a4ed49d 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -31,7 +31,7 @@ entries
412 4 e 6 debug_level
440 4 e 9 slow_cpu
444 1 e 1 nmi
-445 1 e 1 iommu
+445 1 e 1 gart
446 1 e 1 power_on_after_fail
456 1 e 1 ECC_memory
457 1 e 1 ECC_redirection
diff --git a/src/northbridge/amd/amdfam10/misc_control.c b/src/northbridge/amd/amdfam10/misc_control.c
index 847b599b33..ed932a99db 100644
--- a/src/northbridge/amd/amdfam10/misc_control.c
+++ b/src/northbridge/amd/amdfam10/misc_control.c
@@ -38,7 +38,7 @@
*
* @param dev
*
- * There is only one AGP aperture resource needed. The resoruce is added to
+ * There is only one AGP aperture resource needed. The resource is added to
* the northbridge of BSP.
*
* The same trick can be used to augment legacy VGA resources which can
@@ -50,7 +50,7 @@
static void mcf3_read_resources(device_t dev)
{
struct resource *resource;
- unsigned char iommu;
+ unsigned char gart;
/* Read the generic PCI resources */
pci_dev_read_resources(dev);
@@ -59,13 +59,13 @@ static void mcf3_read_resources(device_t dev)
return;
}
- iommu = 1;
- get_option(&iommu, "iommu");
+ gart = 1;
+ get_option(&gart, "gart");
- if (iommu) {
+ if (gart) {
/* Add a Gart apeture resource */
resource = new_resource(dev, 0x94);
- resource->size = iommu?CONFIG_AGP_APERTURE_SIZE:1;
+ resource->size = gart?CONFIG_AGP_APERTURE_SIZE:1;
resource->align = log2(resource->size);
resource->gran = log2(resource->size);
resource->limit = 0xffffffff; /* 4G */