22 files changed, 18 insertions, 18 deletions
diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig
index 0ad19f27db..1b997aefd6 100644
--- a/src/southbridge/amd/Kconfig
+++ b/src/southbridge/amd/Kconfig
@@ -11,5 +11,5 @@ source src/southbridge/amd/sb600/Kconfig
 source src/southbridge/amd/rs780/Kconfig
 source src/southbridge/amd/sb700/Kconfig
 source src/southbridge/amd/sb800/Kconfig
-source src/southbridge/amd/cimx_wrapper/Kconfig
+source src/southbridge/amd/cimx/Kconfig
 source src/southbridge/amd/sr5650/Kconfig
diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc
index 75e625d6ba..0ec5d7077f 100644
--- a/src/southbridge/amd/Makefile.inc
+++ b/src/southbridge/amd/Makefile.inc
@@ -12,5 +12,5 @@ subdirs-$(CONFIG_SOUTHBRIDGE_AMD_SP5100) += sb700
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5530) += cs5530
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5535) += cs5535
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5536) += cs5536
-subdirs-$(CONFIG_AMD_CIMX_SB800) += cimx_wrapper
+subdirs-$(CONFIG_AMD_CIMX_SB800) += cimx
 
diff --git a/src/southbridge/amd/cimx_wrapper/Kconfig b/src/southbridge/amd/cimx/Kconfig
index 2a51883ac2..38fbb49bee 100644
--- a/src/southbridge/amd/cimx_wrapper/Kconfig
+++ b/src/southbridge/amd/cimx/Kconfig
@@ -17,4 +17,4 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-source src/southbridge/amd/cimx_wrapper/sb800/Kconfig
+source src/southbridge/amd/cimx/sb800/Kconfig
diff --git a/src/southbridge/amd/cimx_wrapper/Makefile.inc b/src/southbridge/amd/cimx/Makefile.inc
index 72ad0eea31..e00a072d6e 100644
--- a/src/southbridge/amd/cimx_wrapper/Makefile.inc
+++ b/src/southbridge/amd/cimx/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_SOUTHBRIDGE_AMD_CIMX_WRAPPER_SB800) += sb800
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800) += sb800
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/Amd.h b/src/southbridge/amd/cimx/sb800/Amd.h
index 6f2d5f17a6..6f2d5f17a6 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/Amd.h
+++ b/src/southbridge/amd/cimx/sb800/Amd.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/AmdSbLib.h b/src/southbridge/amd/cimx/sb800/AmdSbLib.h
index a86f24b6fb..a86f24b6fb 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/AmdSbLib.h
+++ b/src/southbridge/amd/cimx/sb800/AmdSbLib.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig
index 85f110df90..dc1400f04f 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/Kconfig
+++ b/src/southbridge/amd/cimx/sb800/Kconfig
@@ -17,13 +17,13 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config SOUTHBRIDGE_AMD_CIMX_WRAPPER_SB800
+config SOUTHBRIDGE_AMD_CIMX_SB800
 	bool
 	select IOAPIC
 
-if SOUTHBRIDGE_AMD_CIMX_WRAPPER_SB800
+if SOUTHBRIDGE_AMD_CIMX_SB800
 config BOOTBLOCK_SOUTHBRIDGE_INIT
         string
-        default "southbridge/amd/cimx_wrapper/sb800/bootblock.c"
-endif #SOUTHBRIDGE_AMD_CIMX_WRAPPER_SB800
+        default "southbridge/amd/cimx/sb800/bootblock.c"
+endif #SOUTHBRIDGE_AMD_CIMX_SB800
 
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/Makefile.inc b/src/southbridge/amd/cimx/sb800/Makefile.inc
index ca6449495d..ca6449495d 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb800/Makefile.inc
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/SBPLATFORM.h b/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
index 93e1c310e6..93e1c310e6 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/SBPLATFORM.h
+++ b/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/SbEarly.h b/src/southbridge/amd/cimx/sb800/SbEarly.h
index 2dd0e6da14..2dd0e6da14 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/SbEarly.h
+++ b/src/southbridge/amd/cimx/sb800/SbEarly.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/bootblock.c b/src/southbridge/amd/cimx/sb800/bootblock.c
index aaec03cbea..aaec03cbea 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/bootblock.c
+++ b/src/southbridge/amd/cimx/sb800/bootblock.c
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/cbtypes.h b/src/southbridge/amd/cimx/sb800/cbtypes.h
index 03a0854f67..03a0854f67 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/cbtypes.h
+++ b/src/southbridge/amd/cimx/sb800/cbtypes.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/cfg.c b/src/southbridge/amd/cimx/sb800/cfg.c
index 0a09e11e86..0a09e11e86 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/cfg.c
+++ b/src/southbridge/amd/cimx/sb800/cfg.c
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/cfg.h b/src/southbridge/amd/cimx/sb800/cfg.h
index 05db9abbe7..05db9abbe7 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/cfg.h
+++ b/src/southbridge/amd/cimx/sb800/cfg.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/chip.h b/src/southbridge/amd/cimx/sb800/chip.h
index ebd7597665..3581f2e3b0 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/chip.h
+++ b/src/southbridge/amd/cimx/sb800/chip.h
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _CIMX_WRAPPER_SB800_CHIP_H_
-#define _CIMX_WRAPPER_SB800_CHIP_H_
+#ifndef _CIMX_SB800_CHIP_H_
+#define _CIMX_SB800_CHIP_H_
 
-extern struct chip_operations southbridge_amd_cimx_wrapper_sb800_ops;
+extern struct chip_operations southbridge_amd_cimx_sb800_ops;
 
 /*
  * configuration set in mainboard/devicetree.cb
@@ -33,10 +33,10 @@ extern struct chip_operations southbridge_amd_cimx_wrapper_sb800_ops;
  *   3(GPP_CFGMODE_X2110) -PortA Lanes[1:0], PortB Lane2, PortC Lane3
  *   4(GPP_CFGMODE_X1111) -PortA Lanes0, PortB Lane1, PortC Lane2, PortD Lane3
  */
-struct southbridge_amd_cimx_wrapper_sb800_config
+struct southbridge_amd_cimx_sb800_config
 {
 	u32 boot_switch_sata_ide : 1;
 	u8  gpp_configuration;
 };
 
-#endif /* _CIMX_WRAPPER_SB800_CHIP_H_ */
+#endif /* _CIMX_SB800_CHIP_H_ */
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/chip_name.c b/src/southbridge/amd/cimx/sb800/chip_name.c
index 657081e63f..9ce89d6591 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/chip_name.c
+++ b/src/southbridge/amd/cimx/sb800/chip_name.c
@@ -20,6 +20,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations southbridge_amd_cimx_wrapper_sb800_ops = {
+struct chip_operations southbridge_amd_cimx_sb800_ops = {
 	CHIP_NAME("AMD South Bridge  SB800")
 };
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/early.c b/src/southbridge/amd/cimx/sb800/early.c
index 40a18ccd4c..40a18ccd4c 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/early.c
+++ b/src/southbridge/amd/cimx/sb800/early.c
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index 692644357a..7367a18708 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -27,7 +27,7 @@
 #include "lpc.h"		/* lpc_read_resources */
 #include "SBPLATFORM.h" 	/* Platfrom Specific Definitions */
 #include "cfg.h"		/* sb800 Cimx configuration */
-#include "chip.h"		/* struct southbridge_amd_cimx_wrapper_sb800_config */
+#include "chip.h"		/* struct southbridge_amd_cimx_sb800_config */
 
 
 /*implement in mainboard.c*/
@@ -316,8 +316,8 @@ static const struct pci_driver PORTD_driver __pci_driver = {
  */
 static void sb800_enable(device_t dev)
 {
-	struct southbridge_amd_cimx_wrapper_sb800_config *sb_chip =
-		(struct southbridge_amd_cimx_wrapper_sb800_config *)(dev->chip_info);
+	struct southbridge_amd_cimx_sb800_config *sb_chip =
+		(struct southbridge_amd_cimx_sb800_config *)(dev->chip_info);
 
 	sb800_cimx_config(sb_config);
 	printk(BIOS_DEBUG, "sb800_enable() ");
@@ -439,7 +439,7 @@ static void sb800_enable(device_t dev)
 
 }
 
-struct chip_operations southbridge_amd_cimx_wrapper_sb800_ops = {
+struct chip_operations southbridge_amd_cimx_sb800_ops = {
 	CHIP_NAME("ATI SB800")
 	.enable_dev = sb800_enable,
 };
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/lpc.c b/src/southbridge/amd/cimx/sb800/lpc.c
index 39762a9bec..39762a9bec 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/lpc.c
+++ b/src/southbridge/amd/cimx/sb800/lpc.c
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/lpc.h b/src/southbridge/amd/cimx/sb800/lpc.h
index 7b165f8d8e..7b165f8d8e 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/lpc.h
+++ b/src/southbridge/amd/cimx/sb800/lpc.h
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/smbus.c b/src/southbridge/amd/cimx/sb800/smbus.c
index 4b13fdbd81..4b13fdbd81 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/smbus.c
+++ b/src/southbridge/amd/cimx/sb800/smbus.c
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/smbus.h b/src/southbridge/amd/cimx/sb800/smbus.h
index 37ca5efcf5..37ca5efcf5 100644
--- a/src/southbridge/amd/cimx_wrapper/sb800/smbus.h
+++ b/src/southbridge/amd/cimx/sb800/smbus.h