From: Masahiro Yamada Date: Tue, 03 Dec 2013 14:42:32 +0900 Subject: [U-Boot] [PATCH 2/2] Makefile: Select objects by CONFIG_ rather than $(ARCH) or $(CPU) In-Reply-To: <1385608199-29217-3-git-send-email-yamada.m@jp.panasonic.com> References: <1385608199-29217-1-git-send-email-yamada.m@jp.panasonic.com> <1385608199-29217-3-git-send-email-yamada.m@jp.panasonic.com> Message-ID: <20131203144231.EF8B.AA925319@jp.panasonic.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom. > --- a/arch/powerpc/cpu/mpc8xxx/Makefile > +++ b/arch/powerpc/cpu/mpc8xxx/Makefile > @@ -19,10 +19,8 @@ ifdef MINIMAL > obj-$(CONFIG_FSL_LAW) += law.o > > else > - > -ifneq ($(CPU),mpc83xx) > -obj-y += cpu.o > -endif > +obj-$(CONFIG_MPC85xx) += cpu.o > +obj-$(CONFIG_MPC86xx) += cpu.o > > obj-$(CONFIG_OF_LIBFDT) += fdt.o > obj-$(CONFIG_FSL_IFC) += fsl_ifc.o You might see a conflict when applying this patch to the current u-boot/master. Please git am with "-C2" option to avoid a conflict. Best Regards Masahiro Yamada