| Message ID | 1413471500-13735-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 16 October 2014 16:58, Bin Meng <bmeng.cn@gmail.com> wrote: > When building U-Boot with CONFIG_X86_RESET_VECTOR, the linking > process misses the resetvec.o and start16.o so it cannot generate > the rom version of U-Boot. The arch/x86/cpu/Makefile is updated to > pull them into the final linking process. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
On 17 October 2014 11:56, Simon Glass <sjg@chromium.org> wrote: > On 16 October 2014 16:58, Bin Meng <bmeng.cn@gmail.com> wrote: >> When building U-Boot with CONFIG_X86_RESET_VECTOR, the linking >> process misses the resetvec.o and start16.o so it cannot generate >> the rom version of U-Boot. The arch/x86/cpu/Makefile is updated to >> pull them into the final linking process. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-x86/master, thanks!
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 415bc24..e7bb3e3 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -9,5 +9,5 @@ # extra-y = start.o -extra-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o -obj-y = interrupts.o cpu.o +obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o +obj-y += interrupts.o cpu.o
When building U-Boot with CONFIG_X86_RESET_VECTOR, the linking process misses the resetvec.o and start16.o so it cannot generate the rom version of U-Boot. The arch/x86/cpu/Makefile is updated to pull them into the final linking process. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/cpu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)