[U-Boot] [PATCH 1/2] x86: Fix rom version build with CONFIG_X86_RESET_VECTOR

[Simon Glass]

Hi Bin,

On 16 October 2014 10:26, Bin Meng <bmeng.cn at 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 top level Makefile is updated to
> pull them into the final linking process.
>
> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
> ---
>  Makefile | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index 8657417..b23a3a1 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -598,6 +598,7 @@ c_flags := $(KBUILD_CFLAGS) $(cpp_flags)
>  head-y := $(CPUDIR)/start.o
>  head-$(CONFIG_4xx) += arch/powerpc/cpu/ppc4xx/resetvec.o
>  head-$(CONFIG_MPC85xx) += arch/powerpc/cpu/mpc85xx/resetvec.o
> +head-$(CONFIG_X86_RESET_VECTOR) += arch/x86/cpu/resetvec.o arch/x86/cpu/start16.o

Can we please do this in rch/x86/cpu/Makefile instead? Something like:

extra-y = start.o
obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
obj-y += interrupts.o cpu.o
obj-$(CONFIG_PCI) += pci.o

Regards,
Simon