From: Albert ARIBAUD Date: Sat, 9 Nov 2013 11:51:47 +0000 (+0100) Subject: Merge branch 'iu-boot/master' into 'u-boot-arm/master' X-Git-Tag: v2014.01-rc1~77 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=85b8c5c4bf80025de4632ae6c9a8a606e51508a4 Merge branch 'iu-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.h Makefile conflicts are due to additions/removals of object files on the ARM branch vs KBuild introduction on the main branch. Resolution consists in adjusting the list of object files in the main branch version. This also applies to two files which are not listed as conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefile include/configs/omap4_common.h conflicts are due to the OMAP4 conversion to ti_armv7_common.h on the ARM side, and CONFIG_SYS_HZ removal on the main side. Resolution is to convert as this icludes removal of CONFIG_SYS_HZ. include/configs/pdnb3.h is due to a removal on ARM side. Trivial resolution is to remove the file. Note: 'git show' will also list two files just because they are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h --- 85b8c5c4bf80025de4632ae6c9a8a606e51508a4 diff --cc arch/arm/cpu/arm926ejs/mxs/Makefile index 13b5a54522,ea397c7f2a..152546eb41 --- a/arch/arm/cpu/arm926ejs/mxs/Makefile +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile @@@ -5,20 -5,41 +5,20 @@@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk +extra-$(CONFIG_SPL_BUILD) := start.o -LIB = $(obj)lib$(SOC).o - -COBJS = clock.o mxs.o iomux.o timer.o +obj-y = clock.o mxs.o iomux.o timer.o ifdef CONFIG_SPL_BUILD -COBJS += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o +obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o endif -SRCS := $(START:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -START := $(addprefix $(obj),$(START)) - -all: $(obj).depend $(LIB) - -$(LIB): $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - # Specify the target for use in elftosb call - ELFTOSB_TARGET-$(CONFIG_MX23) = imx23 - ELFTOSB_TARGET-$(CONFIG_MX28) = imx28 + MKIMAGE_TARGET-$(CONFIG_MX23) = mx23 + MKIMAGE_TARGET-$(CONFIG_MX28) = mx28 - $(OBJTREE)/u-boot.bd: $(SRCTREE)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd + $(OBJTREE)/mxsimage.cfg: $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@ - $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/u-boot.bd - elftosb -zf $(ELFTOSB_TARGET-y) -c $(OBJTREE)/u-boot.bd -o $(OBJTREE)/u-boot.sb + $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/mxsimage.cfg + $(OBJTREE)/tools/mkimage -n $(OBJTREE)/mxsimage.cfg -T mxsimage $@ - - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --cc board/compulab/cm_t35/Makefile index 66b264a902,213423ec65..6e2e1cbb6a --- a/board/compulab/cm_t35/Makefile +++ b/board/compulab/cm_t35/Makefile @@@ -7,7 -7,23 +7,4 @@@ # SPDX-License-Identifier: GPL-2.0+ # - obj-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o - obj-$(CONFIG_LCD) += display.o -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).o - -COBJS := cm_t35.o leds.o $(COBJS-y) - -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend -- -######################################################################### +obj-y += cm_t35.o leds.o diff --cc board/compulab/common/Makefile index 0000000000,b399c8f46b..831be2e0e7 mode 000000,100644..100644 --- a/board/compulab/common/Makefile +++ b/board/compulab/common/Makefile @@@ -1,0 -1,36 +1,10 @@@ + # + # (C) Copyright 2011 - 2013 CompuLab, Ltd. + # + # Author: Igor Grinberg + # + # SPDX-License-Identifier: GPL-2.0+ + # + -include $(TOPDIR)/config.mk - -ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)board/$(VENDOR)/common) -endif - -LIB = $(obj)lib$(VENDOR).o - -COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o -COBJS-$(CONFIG_LCD) += omap3_display.o - -COBJS := $(COBJS-y) -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -all: $(LIB) - -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(call cmd_link_o_target, $(OBJS) $(SOBJS)) - -######################################################################### -# This is for $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### ++obj-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o ++obj-$(CONFIG_LCD) += omap3_display.o diff --cc board/corscience/tricorder/Makefile index d5316f8d38,8a7f15c795..266432dd2d --- a/board/corscience/tricorder/Makefile +++ b/board/corscience/tricorder/Makefile @@@ -8,4 -8,23 +8,4 @@@ # SPDX-License-Identifier: GPL-2.0+ # - obj-y := tricorder.o -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).o - -COBJS := tricorder.o tricorder-eeprom.o led.o - -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### ++obj-y := tricorder.o tricorder-eeprom.o led.o diff --cc board/ppcag/bg0900/Makefile index 06120f3a84,e17c0a5991..74c6db5b15 --- a/board/ppcag/bg0900/Makefile +++ b/board/ppcag/bg0900/Makefile @@@ -5,4 -5,27 +5,8 @@@ # SPDX-License-Identifier: GPL-2.0+ # - obj-y := flash.o pdnb3.o nand.o -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).o - + ifndef CONFIG_SPL_BUILD -COBJS := bg0900.o ++obj-y := bg0900.o + else -COBJS := spl_boot.o ++obj-y := spl_boot.o + endif - -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --cc board/udoo/Makefile index 0000000000,1f0f6c760f..80efadaf0d mode 000000,100644..100644 --- a/board/udoo/Makefile +++ b/board/udoo/Makefile @@@ -1,0 -1,26 +1,7 @@@ + # + # (C) Copyright 2013 Freescale Semiconductor, Inc. + # + # SPDX-License-Identifier: GPL-2.0+ + # + -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).o - -COBJS := udoo.o - -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### ++obj-y := udoo.o diff --cc drivers/bootcount/Makefile index 012acef9dd,352a0a16d9..8256ed0f46 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@@ -2,8 -2,29 +2,9 @@@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk - -LIB := $(obj)libbootcount.o - -COBJS-y += bootcount.o -COBJS-$(CONFIG_AT91SAM9XE) += bootcount_at91.o -COBJS-$(CONFIG_BLACKFIN) += bootcount_blackfin.o -COBJS-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o -COBJS-$(CONFIG_AM33XX) += bootcount_davinci.o -COBJS-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o - -COBJS := $(COBJS-y) -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################## +obj-y += bootcount.o +obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o +obj-$(CONFIG_BLACKFIN) += bootcount_blackfin.o +obj-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o ++obj-$(CONFIG_AM33XX) += bootcount_davinci.o +obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o