diff options
author | Angel Pons <th3fanbus@gmail.com> | 2020-10-26 00:32:42 +0100 |
---|---|---|
committer | Michael Niewöhner <foss@mniewoehner.de> | 2020-11-13 13:23:33 +0000 |
commit | 1500dd081b386db9b03ff78e74831cf6c9f88ba7 (patch) | |
tree | cf6bfb7aa57e70d128ceaa3625cbe9782373d3b3 | |
parent | 3bd017356a7766c4884e55a28ca481c8a9110ceb (diff) |
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>
-rw-r--r-- | src/soc/intel/broadwell/Makefile.inc | 9 | ||||
-rw-r--r-- | src/soc/intel/broadwell/bootblock.c (renamed from src/soc/intel/broadwell/bootblock/systemagent.c) | 0 | ||||
-rw-r--r-- | src/soc/intel/broadwell/early_init.c (renamed from src/soc/intel/broadwell/romstage/systemagent.c) | 0 | ||||
-rw-r--r-- | src/soc/intel/broadwell/raminit.c (renamed from src/soc/intel/broadwell/romstage/raminit.c) | 0 | ||||
-rw-r--r-- | src/soc/intel/broadwell/report_platform.c (renamed from src/soc/intel/broadwell/romstage/report_platform.c) | 0 | ||||
-rw-r--r-- | src/soc/intel/broadwell/romstage.c (renamed from src/soc/intel/broadwell/romstage/romstage.c) | 0 | ||||
-rw-r--r-- | src/soc/intel/broadwell/romstage/Makefile.inc | 4 |
7 files changed, 6 insertions, 7 deletions
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 index 5edfaeecaf..5edfaeecaf 100644 --- a/src/soc/intel/broadwell/bootblock/systemagent.c +++ b/src/soc/intel/broadwell/bootblock.c diff --git a/src/soc/intel/broadwell/romstage/systemagent.c b/src/soc/intel/broadwell/early_init.c index 6bf7ba7a59..6bf7ba7a59 100644 --- a/src/soc/intel/broadwell/romstage/systemagent.c +++ b/src/soc/intel/broadwell/early_init.c diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/raminit.c index 7020ddfe0d..7020ddfe0d 100644 --- a/src/soc/intel/broadwell/romstage/raminit.c +++ b/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 index 4ed84d7cea..4ed84d7cea 100644 --- a/src/soc/intel/broadwell/romstage/report_platform.c +++ b/src/soc/intel/broadwell/report_platform.c diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage.c index 2e5db76ce9..2e5db76ce9 100644 --- a/src/soc/intel/broadwell/romstage/romstage.c +++ b/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 |