| Message ID | 1458140588-28276-5-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | df13ec696ef61ed575950e4e071d220711afbe4e |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Mar 16, 2016 at 11:03:07AM -0400, Tom Rini wrote: > When we switch to including all linker lists in U-Boot it is important > to not include commands as that may lead to link errors due to other > things we have already discarded. In this case change things so that we > only build the right objects for SPL or non-SPL > > Cc: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> > Signed-off-by: Tom Rini <trini@konsulko.com> Reworded slightly and applied to u-boot/master, thanks!
diff --git a/board/work-microwave/work_92105/Makefile b/board/work-microwave/work_92105/Makefile index ba31c8e..e26c673 100644 --- a/board/work-microwave/work_92105/Makefile +++ b/board/work-microwave/work_92105/Makefile @@ -5,6 +5,8 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := work_92105.o work_92105_display.o - -obj-$(CONFIG_SPL_BUILD) += work_92105_spl.o +ifdef CONFIG_SPL_BUILD +obj-y += work_92105_spl.o +else +obj-y += work_92105.o work_92105_display.o +endif
When we switch to including all linker lists in U-Boot it is important to not include commands as that may lead to link errors due to other things we have already discarded. In this case change things so that we only build the right objects for SPL or non-SPL Cc: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> Signed-off-by: Tom Rini <trini@konsulko.com> --- board/work-microwave/work_92105/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)