| Message ID | 1478446678-130231-2-git-send-email-sven.ebenfeld@gmail.com |
|---|---|
| State | Accepted |
| Commit | 99f49fdd5dcdd1930e1f7b469ab6882c92a0ce4b |
| Delegated to: | Stefano Babic |
| Headers | show |
On Sun, Nov 6, 2016 at 9:37 AM, Sven Ebenfeld <sven.ebenfeld@gmail.com> wrote: > These files are blowing up the SPL and should not be required > there as the SPL delivers no command console. Because building fails > for mx27 and mx31 machines with SPL build, we remove the linker flag > for them from the Makefile. Nothing is built for them to be linked > in that directory. > > Cc: sbabic@denx.de > > v2 Changes: > - Remove mx27 and mx31 from Makefile during SPL build as nothing is built for > them in that directory. And removing the commands with the libs-y directive > lead to linker failures. e.g. "armv5te-ld.bfd: cannot find arch/arm/imx-common/built-in.o: No such file or directory)" > > Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> > --- > arch/arm/Makefile | 2 +- > arch/arm/imx-common/Makefile | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > Reviewed-by: George McCollister <george.mccollister@gmail.com> Tested-by: George McCollister <george.mccollister@gmail.com>
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 42093c2..6faf29e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -93,7 +93,7 @@ libs-y += arch/arm/cpu/ libs-y += arch/arm/lib/ ifeq ($(CONFIG_SPL_BUILD),y) -ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx31 mx35)) +ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35)) libs-y += arch/arm/imx-common/ endif else diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 1873185..03b3c12 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -34,9 +34,11 @@ endif ifeq ($(SOC),$(filter $(SOC),vf610)) obj-y += ddrmc-vf610.o endif +ifneq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o +endif PLUGIN = board/$(BOARDDIR)/plugin
These files are blowing up the SPL and should not be required there as the SPL delivers no command console. Because building fails for mx27 and mx31 machines with SPL build, we remove the linker flag for them from the Makefile. Nothing is built for them to be linked in that directory. Cc: sbabic@denx.de v2 Changes: - Remove mx27 and mx31 from Makefile during SPL build as nothing is built for them in that directory. And removing the commands with the libs-y directive lead to linker failures. e.g. "armv5te-ld.bfd: cannot find arch/arm/imx-common/built-in.o: No such file or directory)" Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> --- arch/arm/Makefile | 2 +- arch/arm/imx-common/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)