summaryrefslogtreecommitdiff
path: root/src/northbridge/amd
diff options
context:
space:
mode:
Diffstat (limited to 'src/northbridge/amd')
-rw-r--r--src/northbridge/amd/Kconfig2
-rw-r--r--src/northbridge/amd/Makefile.inc2
-rw-r--r--src/northbridge/amd/agesa/Kconfig (renamed from src/northbridge/amd/agesa_wrapper/Kconfig)2
-rw-r--r--src/northbridge/amd/agesa/Makefile.inc (renamed from src/northbridge/amd/agesa_wrapper/Makefile.inc)2
-rw-r--r--src/northbridge/amd/agesa/family14/Kconfig (renamed from src/northbridge/amd/agesa_wrapper/family14/Kconfig)8
-rw-r--r--src/northbridge/amd/agesa/family14/Makefile.inc (renamed from src/northbridge/amd/agesa_wrapper/family14/Makefile.inc)0
-rw-r--r--src/northbridge/amd/agesa/family14/amdfam14_conf.c (renamed from src/northbridge/amd/agesa_wrapper/family14/amdfam14_conf.c)0
-rw-r--r--src/northbridge/amd/agesa/family14/bootblock.c (renamed from src/northbridge/amd/agesa_wrapper/family14/bootblock.c)0
-rw-r--r--src/northbridge/amd/agesa/family14/chip.h (renamed from src/northbridge/amd/agesa_wrapper/family14/chip.h)4
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.c (renamed from src/northbridge/amd/agesa_wrapper/family14/northbridge.c)16
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.h (renamed from src/northbridge/amd/agesa_wrapper/family14/northbridge.h)6
-rw-r--r--src/northbridge/amd/agesa/family14/root_complex/Kconfig2
-rw-r--r--src/northbridge/amd/agesa/family14/root_complex/chip.h (renamed from src/northbridge/amd/agesa_wrapper/family14/root_complex/chip.h)4
-rw-r--r--src/northbridge/amd/agesa/family14/ssdt.asl (renamed from src/northbridge/amd/agesa_wrapper/family14/ssdt.asl)0
-rw-r--r--src/northbridge/amd/agesa_wrapper/family14/root_complex/Kconfig2
15 files changed, 25 insertions, 25 deletions
diff --git a/src/northbridge/amd/Kconfig b/src/northbridge/amd/Kconfig
index 914a3d2d5a..4a120ca50b 100644
--- a/src/northbridge/amd/Kconfig
+++ b/src/northbridge/amd/Kconfig
@@ -3,7 +3,7 @@ source src/northbridge/amd/gx1/Kconfig
source src/northbridge/amd/gx2/Kconfig
source src/northbridge/amd/amdfam10/Kconfig
source src/northbridge/amd/lx/Kconfig
-source src/northbridge/amd/agesa_wrapper/Kconfig
+source src/northbridge/amd/agesa/Kconfig
menu "HyperTransport setup"
#could be implemented for K8 (NORTHBRIDGE_AMD_AMDK8)
depends on (NORTHBRIDGE_AMD_AMDFAM10) && EXPERT
diff --git a/src/northbridge/amd/Makefile.inc b/src/northbridge/amd/Makefile.inc
index ba7027c8f3..328fd0f812 100644
--- a/src/northbridge/amd/Makefile.inc
+++ b/src/northbridge/amd/Makefile.inc
@@ -4,5 +4,5 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX1) += gx1
subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2
subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx
-subdirs-$(CONFIG_AMD_AGESA) += agesa_wrapper
+subdirs-$(CONFIG_AMD_AGESA) += agesa
subdirs-$(CONFIG_AMD_AGESA) += ../../vendorcode/amd/agesa
diff --git a/src/northbridge/amd/agesa_wrapper/Kconfig b/src/northbridge/amd/agesa/Kconfig
index 3429255df2..8f282ecfb8 100644
--- a/src/northbridge/amd/agesa_wrapper/Kconfig
+++ b/src/northbridge/amd/agesa/Kconfig
@@ -17,5 +17,5 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-source src/northbridge/amd/agesa_wrapper/family14/Kconfig
+source src/northbridge/amd/agesa/family14/Kconfig
diff --git a/src/northbridge/amd/agesa_wrapper/Makefile.inc b/src/northbridge/amd/agesa/Makefile.inc
index 3e626ed84d..eed0e05a41 100644
--- a/src/northbridge/amd/agesa_wrapper/Makefile.inc
+++ b/src/northbridge/amd/agesa/Makefile.inc
@@ -16,4 +16,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_WRAPPER_FAMILY14) += family14
+subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY14) += family14
diff --git a/src/northbridge/amd/agesa_wrapper/family14/Kconfig b/src/northbridge/amd/agesa/family14/Kconfig
index ed4c5c7019..cdc207b01c 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/Kconfig
+++ b/src/northbridge/amd/agesa/family14/Kconfig
@@ -16,12 +16,12 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-config NORTHBRIDGE_AMD_AGESA_WRAPPER_FAMILY14
+config NORTHBRIDGE_AMD_AGESA_FAMILY14
bool
select MMCONF_SUPPORT
- select NORTHBRIDGE_AMD_AGESA_WRAPPER_FAMILY14_ROOT_COMPLEX
+ select NORTHBRIDGE_AMD_AGESA_FAMILY14_ROOT_COMPLEX
-if NORTHBRIDGE_AMD_AGESA_WRAPPER_FAMILY14
+if NORTHBRIDGE_AMD_AGESA_FAMILY14
config HW_MEM_HOLE_SIZEK
hex
@@ -41,6 +41,6 @@ config MMCONF_BUS_NUMBER
config BOOTBLOCK_NORTHBRIDGE_INIT
string
- default "northbridge/amd/agesa_wrapper/family14/bootblock.c"
+ default "northbridge/amd/agesa/family14/bootblock.c"
endif
diff --git a/src/northbridge/amd/agesa_wrapper/family14/Makefile.inc b/src/northbridge/amd/agesa/family14/Makefile.inc
index 3bda8d5cc4..3bda8d5cc4 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/Makefile.inc
+++ b/src/northbridge/amd/agesa/family14/Makefile.inc
diff --git a/src/northbridge/amd/agesa_wrapper/family14/amdfam14_conf.c b/src/northbridge/amd/agesa/family14/amdfam14_conf.c
index 6ec4da9c9f..6ec4da9c9f 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/amdfam14_conf.c
+++ b/src/northbridge/amd/agesa/family14/amdfam14_conf.c
diff --git a/src/northbridge/amd/agesa_wrapper/family14/bootblock.c b/src/northbridge/amd/agesa/family14/bootblock.c
index eead31d26b..eead31d26b 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/bootblock.c
+++ b/src/northbridge/amd/agesa/family14/bootblock.c
diff --git a/src/northbridge/amd/agesa_wrapper/family14/chip.h b/src/northbridge/amd/agesa/family14/chip.h
index 8319e98f56..26a1aad6bb 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/chip.h
+++ b/src/northbridge/amd/agesa/family14/chip.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-struct northbridge_amd_agesa_wrapper_family14_config
+struct northbridge_amd_agesa_family14_config
{
};
-extern struct chip_operations northbridge_amd_agesa_wrapper_family14_ops;
+extern struct chip_operations northbridge_amd_agesa_family14_ops;
diff --git a/src/northbridge/amd/agesa_wrapper/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index af7d1302d6..78ba2dad07 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -303,7 +303,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
}
#if 0
- // We need to double check if there is speical set on base reg and limit reg
+ // We need to double check if there is speical set on base reg and limit reg
// are not continous instead of hole, it will find out it's hole_startk
if(mem_hole.node_id==-1) {
resource_t limitk_pri = 0;
@@ -324,7 +324,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
}
}
#endif
-
+
return mem_hole;
}
#endif
@@ -459,7 +459,7 @@ static void set_resources(device_t dev)
struct resource *res;
printk(BIOS_DEBUG, "\nFam14h - set_resources.\n");
-
+
/* Find the nodeid */
nodeid = amdfam14_nodeid(dev);
@@ -749,11 +749,11 @@ static void domain_enable_resources(device_t dev)
u32 val;
/* Must be called after PCI enumeration and resource allocation */
printk(BIOS_DEBUG, "\nFam14h - domain_enable_resources: AmdInitMid.\n");
- val = agesawrapper_amdinitmid ();
+ val = agesawrapper_amdinitmid ();
if(val) {
printk(BIOS_DEBUG, "agesawrapper_amdinitmid failed: %x \n", val);
}
-
+
printk(BIOS_DEBUG, " ader - leaving domain_enable_resources.\n");
}
@@ -785,7 +785,7 @@ static void cpu_bus_set_resources(device_t dev)
}
pci_dev_set_resources(dev);
}
-
+
static void cpu_bus_init(device_t dev)
{
struct device_path cpu_path;
@@ -826,7 +826,7 @@ static const struct pci_driver northbridge_driver __pci_driver = {
};
-struct chip_operations northbridge_amd_agesa_wrapper_family14_ops = {
+struct chip_operations northbridge_amd_agesa_family14_ops = {
CHIP_NAME("AMD Family 14h Northbridge")
.enable_dev = 0,
};
@@ -865,7 +865,7 @@ static void root_complex_enable_dev(struct device *dev)
}
-struct chip_operations northbridge_amd_agesa_wrapper_family14_root_complex_ops = {
+struct chip_operations northbridge_amd_agesa_family14_root_complex_ops = {
CHIP_NAME("AMD Family 14h Root Complex")
.enable_dev = root_complex_enable_dev,
};
diff --git a/src/northbridge/amd/agesa_wrapper/family14/northbridge.h b/src/northbridge/amd/agesa/family14/northbridge.h
index 2e9be562fc..fb8df38352 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/northbridge.h
+++ b/src/northbridge/amd/agesa/family14/northbridge.h
@@ -17,10 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NORTHBRIDGE_AMD_AGESA_WRAPPER_FAM14H_H
-#define NORTHBRIDGE_AMD_AGESA_WRAPPER_FAM14H_H
+#ifndef NORTHBRIDGE_AMD_AGESA_FAM14H_H
+#define NORTHBRIDGE_AMD_AGESA_FAM14H_H
static struct device_operations pci_domain_ops;
static struct device_operations cpu_bus_ops;
-#endif /* NORTHBRIDGE_AMD_AGESA_WRAPPER_FAM14H_H */
+#endif /* NORTHBRIDGE_AMD_AGESA_FAM14H_H */
diff --git a/src/northbridge/amd/agesa/family14/root_complex/Kconfig b/src/northbridge/amd/agesa/family14/root_complex/Kconfig
new file mode 100644
index 0000000000..f4eed4f2e1
--- /dev/null
+++ b/src/northbridge/amd/agesa/family14/root_complex/Kconfig
@@ -0,0 +1,2 @@
+config NORTHBRIDGE_AMD_AGESA_FAMILY14_ROOT_COMPLEX
+ bool
diff --git a/src/northbridge/amd/agesa_wrapper/family14/root_complex/chip.h b/src/northbridge/amd/agesa/family14/root_complex/chip.h
index 71b90c617a..234f931aef 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/root_complex/chip.h
+++ b/src/northbridge/amd/agesa/family14/root_complex/chip.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-struct northbridge_amd_agesa_wrapper_family14_root_complex_config
+struct northbridge_amd_agesa_family14_root_complex_config
{
};
-extern struct chip_operations northbridge_amd_agesa_wrapper_family14_root_complex_ops;
+extern struct chip_operations northbridge_amd_agesa_family14_root_complex_ops;
diff --git a/src/northbridge/amd/agesa_wrapper/family14/ssdt.asl b/src/northbridge/amd/agesa/family14/ssdt.asl
index e69012bc66..e69012bc66 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/ssdt.asl
+++ b/src/northbridge/amd/agesa/family14/ssdt.asl
diff --git a/src/northbridge/amd/agesa_wrapper/family14/root_complex/Kconfig b/src/northbridge/amd/agesa_wrapper/family14/root_complex/Kconfig
deleted file mode 100644
index 5659b8b5a4..0000000000
--- a/src/northbridge/amd/agesa_wrapper/family14/root_complex/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-config NORTHBRIDGE_AMD_AGESA_WRAPPER_FAMILY14_ROOT_COMPLEX
- bool