diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-07-25 11:18:46 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-07-27 00:40:05 +0200 |
| commit | 40d93494c3dcfe7850aed056e1ad9c4b285c0f5b (patch) | |
| tree | fa117904c80c5b917a3a3a059f0f380406c38a86 | |
| parent | 9cbc90a1f6e197258ed47bc44016640f2b1e5a31 (diff) | |
device: include devicetree in bootblock stage
Allow bootblock to get access to the static device tree like
other early stages. device_romstage.c was renamed to
device_simple.c to better articulate the usage since it's not
just being used in romstage.
BUG=chrome-os-partner:55357
Change-Id: I3d63d2754c737cc738c09a3e3b3b468362fb78d1
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/15837
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | Makefile.inc | 1 | ||||
| -rw-r--r-- | src/device/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/device/device_simple.c (renamed from src/device/device_romstage.c) | 0 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc index 29e22eb8e9..a33dc7bc71 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -458,6 +458,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devi ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c verstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c +bootblock-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c $(objgenerated)/libverstage.a: $$(libverstage-objs) rm -f $@ diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc index 261ed53656..232a981122 100644 --- a/src/device/Makefile.inc +++ b/src/device/Makefile.inc @@ -20,8 +20,9 @@ ifeq ($(CONFIG_AZALIA_PLUGIN_SUPPORT),y) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c endif -verstage-y += device_romstage.c -romstage-y += device_romstage.c +bootblock-y += device_simple.c +verstage-y += device_simple.c +romstage-y += device_simple.c romstage-$(CONFIG_PCI) += pci_early.c subdirs-y += oprom dram diff --git a/src/device/device_romstage.c b/src/device/device_simple.c index 828e99b75e..828e99b75e 100644 --- a/src/device/device_romstage.c +++ b/src/device/device_simple.c |