On 07/01/2016 07:16 PM, Ed Swarthout wrote:
Fixes build breaks for T4240QDS_SDCARD and T4240QDS_NAND:
arch/powerpc/cpu/mpc85xx/built-in.o: In function `do_errata': /home/swarthou/bsp/stash/u-boot-devel/arch/powerpc/cpu/mpc85xx/cmd_errata.c:299: undefined reference to `has_erratum_a007798' /home/swarthou/bsp/stash/u-boot-devel/arch/powerpc/cpu/mpc85xx/cmd_errata.c:312: undefined reference to `has_erratum_a006261' /home/swarthou/bsp/stash/u-boot-devel/scripts/Makefile.spl:251: recipe for target 'spl/u-boot-spl' failed make[2]: *** [spl/u-boot-spl] Error 1 /home/swarthou/bsp/stash/u-boot-devel/Makefile:1322: recipe for target 'spl/u-boot-spl' failed
Signed-off-by: Ed Swarthout Ed.Swarthout@nxp.com
This applies to denx/master.
If there is a reason why cmd_errata is needed in SPL, a different fix would be needed...
arch/powerpc/cpu/mpc85xx/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 65c26c0..5e7b130 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -14,6 +14,8 @@ ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y endif +else +obj-$(CONFIG_CMD_ERRATA) += cmd_errata.o endif
extra-y = start.o resetvec.o @@ -26,7 +28,6 @@ else
obj-$(CONFIG_MP) += release.o
-obj-$(CONFIG_CMD_ERRATA) += cmd_errata.o obj-$(CONFIG_CPM2) += commproc.o
obj-$(CONFIG_CPM2) += ether_fcc.o
Sriram,
Please check Ed's suggestion. I think it makes sense to remove cmd_errata.o for SPL part. When the normal U-Boot comes up, this file will be linked. I probably gave you a wrong suggestion about the CMD_ERRATA has nothing to do with USB. That's still true, but for SPL build we don't need to run "errata" command.
York