commit 1500dd081b386db9b03ff78e74831cf6c9f88ba7
author Angel Pons <th3fanbus@gmail.com> Mon Oct 26 00:32:42 2020 +0100
committer Michael Niewöhner <foss@mniewoehner.de> Fri Nov 13 13:23:33 2020 +0000
tree cf6bfb7aa57e70d128ceaa3625cbe9782373d3b3
parent 3bd017356a7766c4884e55a28ca481c8a9110ceb

soc/intel/broadwell: Flatten northbridge folder structure

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

diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index dc6bd93c..7ee6990 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

src/soc/intel/broadwell/bootblock.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

src/soc/intel/broadwell/early_init.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

src/soc/intel/broadwell/raminit.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

src/soc/intel/broadwell/report_platform.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

src/soc/intel/broadwell/romstage.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

src/soc/intel/broadwell/romstage/Makefile.inc

diff --git a/src/soc/intel/broadwell/romstage/Makefile.inc b/src/soc/intel/broadwell/romstage/Makefile.inc
deleted file mode 100644
index 65cb9ad..0000000
--- 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