[U-Boot] [PATCH v2 3/5] x86: Remove unneeded cruft from main Makefile

[Simon Glass]

On Thu, Feb 14, 2013 at 4:00 PM, Gabe Black <gabeblack at google.com> wrote:
> Acked-by: Gabe Black <gabeblack at chromium.org>
>
>
> On Thu, Feb 14, 2013 at 6:18 AM, Simon Glass <sjg at chromium.org> wrote:
>>
>> These lines are dealt with in the x86 Makefile and link script, so punt
>> them.
>>
>> Signed-off-by: Simon Glass <sjg at chromium.org>

Applied to x86/master.

>> ---
>> Changes in v2:
>> - Add new patch to tidy up main Makefile
>>
>>  Makefile | 6 +-----
>>  1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 35eee70..fc18dd4 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -230,10 +230,6 @@ endif
>>  # U-Boot objects....order is important (i.e. start must be first)
>>
>>  OBJS  = $(CPUDIR)/start.o
>> -ifeq ($(CPU),x86)
>> -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/start16.o
>> -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/resetvec.o
>> -endif
>>  ifeq ($(CPU),ppc4xx)
>>  OBJS += $(CPUDIR)/resetvec.o
>>  endif
>> @@ -241,7 +237,7 @@ ifeq ($(CPU),mpc85xx)
>>  OBJS += $(CPUDIR)/resetvec.o
>>  endif
>>
>> -OBJS := $(addprefix $(obj),$(OBJS) $(RESET_OBJS-))
>> +OBJS := $(addprefix $(obj),$(OBJS))
>>
>>  HAVE_VENDOR_COMMON_LIB = $(if $(wildcard
>> board/$(VENDOR)/common/Makefile),y,n)
>>
>> --
>> 1.8.1
>>
>