| Message ID | 1416889101-17125-8-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, Can you apply this as a single patch ASAP to fix the build error, please? Masahiro On Mon, 24 Nov 2014 21:18:20 -0700 Simon Glass <sjg@chromium.org> wrote: > It is now required to add subdirectories in the x86 cpu Makefile. Add this > to fix a build breakage for chromebook_link. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v3: > - Add new patch to add ivybridge directory to Makefile > > Changes in v2: None > > arch/x86/cpu/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile > index 4d3c5ea..7f09db5 100644 > --- a/arch/x86/cpu/Makefile > +++ b/arch/x86/cpu/Makefile > @@ -13,6 +13,8 @@ obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o > obj-y += interrupts.o cpu.o call64.o > > obj-$(CONFIG_SYS_COREBOOT) += coreboot/ > +obj-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += ivybridge/ > +obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ > obj-y += lapic.o > obj-$(CONFIG_PCI) += pci.o > obj-y += turbo.o > -- > 2.1.0.rc2.206.gedb03e5 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
+Tom On 25 November 2014 at 00:04, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > Hi Simon, > > Can you apply this as a single patch ASAP > to fix the build error, please? > > Masahiro > It's a new board and the support is so far incomplete anyway, so it's not unexpected that some pull requests might collide. Since I'm bringing in the remaining patches to finish off this port (display, keyboard, USB, SATA, EC all work!), I will just include this patch there. It's a lot of patches so Tom please feel free to pick just this one if you like. I'll send an x86 pull request as soon as I've completed final testing (the last one for this release). Applied to u-boot-x86.
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 4d3c5ea..7f09db5 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -13,6 +13,8 @@ obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o obj-y += interrupts.o cpu.o call64.o obj-$(CONFIG_SYS_COREBOOT) += coreboot/ +obj-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += ivybridge/ +obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ obj-y += lapic.o obj-$(CONFIG_PCI) += pci.o obj-y += turbo.o
It is now required to add subdirectories in the x86 cpu Makefile. Add this to fix a build breakage for chromebook_link. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: - Add new patch to add ivybridge directory to Makefile Changes in v2: None arch/x86/cpu/Makefile | 2 ++ 1 file changed, 2 insertions(+)