[U-Boot] [PATCH 2/2] Makefile: Select objects by CONFIG_ rather than $(ARCH) or $(CPU)

Masahiro Yamada yamada.m at jp.panasonic.com
Tue Dec 3 06:42:32 CET 2013


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



More information about the U-Boot mailing list