Message ID | 1415849323-32670-3-git-send-email-yamada.m@jp.panasonic.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On 12 November 2014 20:28, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > The references of CONFIG_SYS_COREBOOT in arch/x86/cpu/coreboot/Makefile > are redundant because the build system descends into the directory > only when CONFIG_SYS_COREBOOT is defined. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Cc: Simon Glass <sjg@chromium.org> > --- > > arch/x86/cpu/Makefile | 2 +- > arch/x86/cpu/coreboot/Makefile | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) Yes, this was annoying me, thanks. Acked-by: Simon Glass <sjg@chromium.org> Regards, Simon
On Thu, Nov 13, 2014 at 12:28:41PM +0900, Masahiro Yamada wrote: > The references of CONFIG_SYS_COREBOOT in arch/x86/cpu/coreboot/Makefile > are redundant because the build system descends into the directory > only when CONFIG_SYS_COREBOOT is defined. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Cc: Simon Glass <sjg@chromium.org> > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index b5ad1ba..8dd7b06 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -12,4 +12,4 @@ extra-y = start.o obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o obj-y += interrupts.o cpu.o call64.o -obj-y += $(if $(SOC),$(SOC)/) +obj-$(CONFIG_SYS_COREBOOT) += coreboot/ diff --git a/arch/x86/cpu/coreboot/Makefile b/arch/x86/cpu/coreboot/Makefile index cd0bf4e..35e6cdd 100644 --- a/arch/x86/cpu/coreboot/Makefile +++ b/arch/x86/cpu/coreboot/Makefile @@ -13,10 +13,10 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_SYS_COREBOOT) += car.o -obj-$(CONFIG_SYS_COREBOOT) += coreboot.o -obj-$(CONFIG_SYS_COREBOOT) += tables.o -obj-$(CONFIG_SYS_COREBOOT) += ipchecksum.o -obj-$(CONFIG_SYS_COREBOOT) += sdram.o -obj-$(CONFIG_SYS_COREBOOT) += timestamp.o +obj-y += car.o +obj-y += coreboot.o +obj-y += tables.o +obj-y += ipchecksum.o +obj-y += sdram.o +obj-y += timestamp.o obj-$(CONFIG_PCI) += pci.o
The references of CONFIG_SYS_COREBOOT in arch/x86/cpu/coreboot/Makefile are redundant because the build system descends into the directory only when CONFIG_SYS_COREBOOT is defined. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/coreboot/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)