dmp/vortex86ex: Merge northbridge and southbridge into soc

Change-Id: I16c04452d2d6c3205aea29fe8aa8fad8fc485a46
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/14600
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

18 files changed, 22 insertions, 82 deletions

diff --git a/src/mainboard/dmp/vortex86ex/Kconfig b/src/mainboard/dmp/vortex86ex/Kconfig
index f6e5d0c68e..9c4c178f69 100644
--- a/src/mainboard/dmp/vortex86ex/Kconfig
+++ b/src/mainboard/dmp/vortex86ex/Kconfig
@@ -18,8 +18,7 @@ if BOARD_DMP_EX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select CPU_DMP_VORTEX86EX
-	select NORTHBRIDGE_DMP_VORTEX86EX
-	select SOUTHBRIDGE_DMP_VORTEX86EX
+	select SOC_DMP_VORTEX86EX
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 	select ROMCC
diff --git a/src/mainboard/dmp/vortex86ex/devicetree.cb b/src/mainboard/dmp/vortex86ex/devicetree.cb
index 46dd2436f7..4106bed448 100644
--- a/src/mainboard/dmp/vortex86ex/devicetree.cb
+++ b/src/mainboard/dmp/vortex86ex/devicetree.cb
@@ -13,18 +13,16 @@
 ## GNU General Public License for more details.
 ##
 
-chip northbridge/dmp/vortex86ex			# North Bridge
+chip soc/dmp/vortex86ex			# North Bridge
 	device domain 0 on
 		device pci 0.0 on end		# Host Bridge
-		chip southbridge/dmp/vortex86ex	# South Bridge
-			device pci 7.0 on end	# ISA Bridge
-			device pci 8.0 on end	# Ethernet
-			device pci a.0 on end	# USB 1.1
-			device pci a.1 on end	# USB 2.0
-			device pci b.0 on end	# USB 1.1
-			device pci b.1 on end	# USB 2.0
-			device pci c.0 on end	# IDE
-		end
+		device pci 7.0 on end	# ISA Bridge
+		device pci 8.0 on end	# Ethernet
+		device pci a.0 on end	# USB 1.1
+		device pci a.1 on end	# USB 2.0
+		device pci b.0 on end	# USB 1.1
+		device pci b.1 on end	# USB 2.0
+		device pci c.0 on end	# IDE
 	end # pci domain 0
 	chip cpu/dmp/vortex86ex end	# CPU
 end
diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c
index a6aa59b5dc..0b02373952 100644
--- a/src/mainboard/dmp/vortex86ex/romstage.c
+++ b/src/mainboard/dmp/vortex86ex/romstage.c
@@ -22,9 +22,9 @@
 #include <cpu/x86/cache.h>
 #include <halt.h>
 #include "drivers/pc80/pc/i8254.c"
-#include <northbridge/dmp/vortex86ex/northbridge.h>
-#include <southbridge/dmp/vortex86ex/southbridge.h>
-#include "northbridge/dmp/vortex86ex/raminit.c"
+#include <soc/dmp/vortex86ex/northbridge.h>
+#include <soc/dmp/vortex86ex/southbridge.h>
+#include "soc/dmp/vortex86ex/raminit.c"
 #include <cpu/dmp/dmp_post_code.h>
 
 #define DMP_CPUID_SX      0x31504d44
diff --git a/src/northbridge/dmp/vortex86ex/Kconfig b/src/northbridge/dmp/vortex86ex/Kconfig
deleted file mode 100644
index 7daf10ce7c..0000000000
--- a/src/northbridge/dmp/vortex86ex/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2013 DMP Electronics 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.
-##
-
-config NORTHBRIDGE_DMP_VORTEX86EX
-	bool
-	select LATE_CBMEM_INIT
diff --git a/src/northbridge/dmp/vortex86ex/Makefile.inc b/src/northbridge/dmp/vortex86ex/Makefile.inc
deleted file mode 100644
index bfc81ca798..0000000000
--- a/src/northbridge/dmp/vortex86ex/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2013 DMP Electronics 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.
-##
-
-ifeq ($(CONFIG_NORTHBRIDGE_DMP_VORTEX86EX),y)
-
-ramstage-y += northbridge.c
-ramstage-y += xgi_oprom.c
-
-endif
diff --git a/src/northbridge/dmp/vortex86ex/chip.h b/src/northbridge/dmp/vortex86ex/chip.h
deleted file mode 100644
index d7b4b93fbe..0000000000
--- a/src/northbridge/dmp/vortex86ex/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 DMP Electronics 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.
- */
-
-#ifndef _NORTHBRIDGE_DMP_VORTEX86EX
-#define _NORTHBRIDGE_DMP_VORTEX86EX
-
-struct northbridge_dmp_vortex86ex_config {
-};
-
-#endif				/* _NORTHBRIDGE_DMP_VORTEX86EX */
diff --git a/src/southbridge/dmp/vortex86ex/Kconfig b/src/soc/dmp/vortex86ex/Kconfig
index 37bd7c8d55..7c616d6f29 100644
--- a/src/southbridge/dmp/vortex86ex/Kconfig
+++ b/src/soc/dmp/vortex86ex/Kconfig
@@ -13,7 +13,8 @@
 ## GNU General Public License for more details.
 ##
 
-config SOUTHBRIDGE_DMP_VORTEX86EX
+config SOC_DMP_VORTEX86EX
 	bool
+	select LATE_CBMEM_INIT
 	select AZALIA_PLUGIN_SUPPORT
 	select HAVE_HARD_RESET
diff --git a/src/southbridge/dmp/vortex86ex/Makefile.inc b/src/soc/dmp/vortex86ex/Makefile.inc
index 7232a63873..a896fcd6fc 100644
--- a/src/southbridge/dmp/vortex86ex/Makefile.inc
+++ b/src/soc/dmp/vortex86ex/Makefile.inc
@@ -13,7 +13,10 @@
 ## GNU General Public License for more details.
 ##
 
-ifeq ($(CONFIG_SOUTHBRIDGE_DMP_VORTEX86EX),y)
+ifeq ($(CONFIG_SOC_DMP_VORTEX86EX),y)
+
+ramstage-y += northbridge.c
+ramstage-y += xgi_oprom.c
 
 ramstage-y += southbridge.c
 ramstage-y += hard_reset.c
diff --git a/src/southbridge/dmp/vortex86ex/audio.c b/src/soc/dmp/vortex86ex/audio.c
index 05a0d8c7d2..05a0d8c7d2 100644
--- a/src/southbridge/dmp/vortex86ex/audio.c
+++ b/src/soc/dmp/vortex86ex/audio.c
diff --git a/src/southbridge/dmp/vortex86ex/chip.h b/src/soc/dmp/vortex86ex/chip.h
index 11bf3cca9a..d67b8014c1 100644
--- a/src/southbridge/dmp/vortex86ex/chip.h
+++ b/src/soc/dmp/vortex86ex/chip.h
@@ -13,10 +13,10 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _SOUTHBRIDGE_DMP_VORTEX86EX
-#define _SOUTHBRIDGE_DMP_VORTEX86EX
+#ifndef _SOC_DMP_VORTEX86EX
+#define _SOC_DMP_VORTEX86EX
 
-struct southbridge_dmp_vortex86ex_config {
+struct soc_dmp_vortex86ex_config {
 	/* PCI function enables */
 	/* i.e. so that pci scan bus will find them. */
 	/* I am putting in IDE as an example but obviously this needs
@@ -31,4 +31,4 @@ struct southbridge_dmp_vortex86ex_config {
 	int enable_nvram;
 };
 
-#endif				/* _SOUTHBRIDGE_DMP_VORTEX86EX */
+#endif				/* _SOC_DMP_VORTEX86EX */
diff --git a/src/southbridge/dmp/vortex86ex/hard_reset.c b/src/soc/dmp/vortex86ex/hard_reset.c
index 9b9c426733..9b9c426733 100644
--- a/src/southbridge/dmp/vortex86ex/hard_reset.c
+++ b/src/soc/dmp/vortex86ex/hard_reset.c
diff --git a/src/southbridge/dmp/vortex86ex/ide_sd_sata.c b/src/soc/dmp/vortex86ex/ide_sd_sata.c
index 936505e436..936505e436 100644
--- a/src/southbridge/dmp/vortex86ex/ide_sd_sata.c
+++ b/src/soc/dmp/vortex86ex/ide_sd_sata.c
diff --git a/src/northbridge/dmp/vortex86ex/northbridge.c b/src/soc/dmp/vortex86ex/northbridge.c
index 62c68e062e..62c68e062e 100644
--- a/src/northbridge/dmp/vortex86ex/northbridge.c
+++ b/src/soc/dmp/vortex86ex/northbridge.c
diff --git a/src/northbridge/dmp/vortex86ex/northbridge.h b/src/soc/dmp/vortex86ex/northbridge.h
index d5bb6f1c3a..d5bb6f1c3a 100644
--- a/src/northbridge/dmp/vortex86ex/northbridge.h
+++ b/src/soc/dmp/vortex86ex/northbridge.h
diff --git a/src/northbridge/dmp/vortex86ex/raminit.c b/src/soc/dmp/vortex86ex/raminit.c
index 1ccdb27e7e..1ccdb27e7e 100644
--- a/src/northbridge/dmp/vortex86ex/raminit.c
+++ b/src/soc/dmp/vortex86ex/raminit.c
diff --git a/src/southbridge/dmp/vortex86ex/southbridge.c b/src/soc/dmp/vortex86ex/southbridge.c
index 05702d1eb6..05702d1eb6 100644
--- a/src/southbridge/dmp/vortex86ex/southbridge.c
+++ b/src/soc/dmp/vortex86ex/southbridge.c
diff --git a/src/southbridge/dmp/vortex86ex/southbridge.h b/src/soc/dmp/vortex86ex/southbridge.h
index c2b91027ae..c2b91027ae 100644
--- a/src/southbridge/dmp/vortex86ex/southbridge.h
+++ b/src/soc/dmp/vortex86ex/southbridge.h
diff --git a/src/northbridge/dmp/vortex86ex/xgi_oprom.c b/src/soc/dmp/vortex86ex/xgi_oprom.c
index b72157d37f..b72157d37f 100644
--- a/src/northbridge/dmp/vortex86ex/xgi_oprom.c
+++ b/src/soc/dmp/vortex86ex/xgi_oprom.c