From 1500dd081b386db9b03ff78e74831cf6c9f88ba7 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Mon, 26 Oct 2020 00:32:42 +0100
Subject: [PATCH] soc/intel/broadwell: Flatten northbridge folder structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Having folders for bootblock and romstage is no longer necessary.

Change-Id: I7d1f4063de6a1a1ff9ee7478e94f889a50102054
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46795
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/intel/broadwell/Makefile.inc                     | 9 ++++++---
 .../broadwell/{bootblock/systemagent.c => bootblock.c}   | 0
 .../broadwell/{romstage/systemagent.c => early_init.c}   | 0
 src/soc/intel/broadwell/{romstage => }/raminit.c         | 0
 src/soc/intel/broadwell/{romstage => }/report_platform.c | 0
 src/soc/intel/broadwell/{romstage => }/romstage.c        | 0
 src/soc/intel/broadwell/romstage/Makefile.inc            | 4 ----
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename src/soc/intel/broadwell/{bootblock/systemagent.c => bootblock.c} (100%)
 rename src/soc/intel/broadwell/{romstage/systemagent.c => early_init.c} (100%)
 rename src/soc/intel/broadwell/{romstage => }/raminit.c (100%)
 rename src/soc/intel/broadwell/{romstage => }/report_platform.c (100%)
 rename src/soc/intel/broadwell/{romstage => }/romstage.c (100%)
 delete mode 100644 src/soc/intel/broadwell/romstage/Makefile.inc

diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index dc6bd93c34..7ee69908f8 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -1,11 +1,14 @@
 ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
 
-subdirs-y += romstage
-
 subdirs-y += cpu
 subdirs-y += pch
 
-bootblock-y += bootblock/systemagent.c
+bootblock-y += bootblock.c
+
+romstage-y += early_init.c
+romstage-y += raminit.c
+romstage-y += report_platform.c
+romstage-y += romstage.c
 
 ramstage-y += acpi.c
 ramstage-y += finalize.c
diff --git a/src/soc/intel/broadwell/bootblock/systemagent.c b/src/soc/intel/broadwell/bootblock.c
similarity index 100%
rename from src/soc/intel/broadwell/bootblock/systemagent.c
rename to src/soc/intel/broadwell/bootblock.c
diff --git a/src/soc/intel/broadwell/romstage/systemagent.c b/src/soc/intel/broadwell/early_init.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/systemagent.c
rename to src/soc/intel/broadwell/early_init.c
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/raminit.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/raminit.c
rename to src/soc/intel/broadwell/raminit.c
diff --git a/src/soc/intel/broadwell/romstage/report_platform.c b/src/soc/intel/broadwell/report_platform.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/report_platform.c
rename to src/soc/intel/broadwell/report_platform.c
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/romstage.c
rename to src/soc/intel/broadwell/romstage.c
diff --git a/src/soc/intel/broadwell/romstage/Makefile.inc b/src/soc/intel/broadwell/romstage/Makefile.inc
deleted file mode 100644
index 65cb9adee5..0000000000
--- a/src/soc/intel/broadwell/romstage/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-romstage-y += raminit.c
-romstage-y += report_platform.c
-romstage-y += romstage.c
-romstage-y += systemagent.c