Rename {CPU|NB|SB}/amd/*_wrapper folders
This change renames the cpu/amd/agesa_wrapper, northbridge/
amd/agesa_wrapper, and southbridge/amd/cimx_wrapper folders
to {cpu|NB}/amd/agesa and {SB}/amd/agesa to shorten and
simplify the folder names.
There is also a fix to vendorcode/amd/agesa/lib/amdlib.c to
append "ull" to a trio of 64-bit hexadecimal constants to
allow abuild to run successfully.
Change-Id: I2455e0afb0361ad2e11da2b869ffacbd552cb715
Signed-off-by: Frank Vibrans <frank.vibrans@amd.com>
Signed-off-by: efdesign98 <efdesign98@gmail.com>
Reviewed-on: http://review.coreboot.org/51
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marcj303@gmail.com>
diff --git a/src/northbridge/amd/Kconfig b/src/northbridge/amd/Kconfig
index 914a3d2..4a120ca 100644
--- a/src/northbridge/amd/Kconfig
+++ b/src/northbridge/amd/Kconfig
@@ -3,7 +3,7 @@
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 ba7027c..328fd0f 100644
--- a/src/northbridge/amd/Makefile.inc
+++ b/src/northbridge/amd/Makefile.inc
@@ -4,5 +4,5 @@
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
similarity index 92%
rename from src/northbridge/amd/agesa_wrapper/Kconfig
rename to src/northbridge/amd/agesa/Kconfig
index 3429255..8f282ec 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/Kconfig b/src/northbridge/amd/agesa/Makefile.inc
similarity index 91%
copy from src/northbridge/amd/agesa_wrapper/Kconfig
copy to src/northbridge/amd/agesa/Makefile.inc
index 3429255..eed0e05 100644
--- a/src/northbridge/amd/agesa_wrapper/Kconfig
+++ b/src/northbridge/amd/agesa/Makefile.inc
@@ -16,6 +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
#
-
-source src/northbridge/amd/agesa_wrapper/family14/Kconfig
-
+subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY14) += family14
diff --git a/src/northbridge/amd/agesa_wrapper/family14/Kconfig b/src/northbridge/amd/agesa/family14/Kconfig
similarity index 83%
rename from src/northbridge/amd/agesa_wrapper/family14/Kconfig
rename to src/northbridge/amd/agesa/family14/Kconfig
index ed4c5c7..cdc207b 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 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
similarity index 100%
rename from src/northbridge/amd/agesa_wrapper/family14/Makefile.inc
rename to 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
similarity index 100%
rename from src/northbridge/amd/agesa_wrapper/family14/amdfam14_conf.c
rename to 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
similarity index 100%
rename from src/northbridge/amd/agesa_wrapper/family14/bootblock.c
rename to 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
similarity index 85%
rename from src/northbridge/amd/agesa_wrapper/family14/chip.h
rename to src/northbridge/amd/agesa/family14/chip.h
index 8319e98..26a1aad 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
similarity index 98%
rename from src/northbridge/amd/agesa_wrapper/family14/northbridge.c
rename to src/northbridge/amd/agesa/family14/northbridge.c
index af7d130..78ba2da 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -303,7 +303,7 @@
}
#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 @@
}
}
#endif
-
+
return mem_hole;
}
#endif
@@ -459,7 +459,7 @@
struct resource *res;
printk(BIOS_DEBUG, "\nFam14h - set_resources.\n");
-
+
/* Find the nodeid */
nodeid = amdfam14_nodeid(dev);
@@ -749,11 +749,11 @@
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 @@
}
pci_dev_set_resources(dev);
}
-
+
static void cpu_bus_init(device_t dev)
{
struct device_path cpu_path;
@@ -826,7 +826,7 @@
};
-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 @@
}
-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
similarity index 85%
rename from src/northbridge/amd/agesa_wrapper/family14/northbridge.h
rename to src/northbridge/amd/agesa/family14/northbridge.h
index 2e9be56..fb8df38 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 0000000..f4eed4f
--- /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/chip.h b/src/northbridge/amd/agesa/family14/root_complex/chip.h
similarity index 84%
copy from src/northbridge/amd/agesa_wrapper/family14/chip.h
copy to src/northbridge/amd/agesa/family14/root_complex/chip.h
index 8319e98..234f931 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/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_config
+struct northbridge_amd_agesa_family14_root_complex_config
{
};
-extern struct chip_operations northbridge_amd_agesa_wrapper_family14_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
similarity index 100%
rename from src/northbridge/amd/agesa_wrapper/family14/ssdt.asl
rename to src/northbridge/amd/agesa/family14/ssdt.asl
diff --git a/src/northbridge/amd/agesa_wrapper/Makefile.inc b/src/northbridge/amd/agesa_wrapper/Makefile.inc
deleted file mode 100644
index 3e626ed..0000000
--- a/src/northbridge/amd/agesa_wrapper/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of the coreboot project.
-#
-# Copyright (C) 2011 Advanced Micro Devices, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# 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
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 5659b8b..0000000
--- 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
diff --git a/src/northbridge/amd/agesa_wrapper/family14/root_complex/chip.h b/src/northbridge/amd/agesa_wrapper/family14/root_complex/chip.h
deleted file mode 100644
index 71b90c6..0000000
--- a/src/northbridge/amd/agesa_wrapper/family14/root_complex/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-struct northbridge_amd_agesa_wrapper_family14_root_complex_config
-{
-};
-
-extern struct chip_operations northbridge_amd_agesa_wrapper_family14_root_complex_ops;