Commit 1acd72a1 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

u-boot: fix version detection and get rid of unneeded double CFLAGS/LDFLAGS 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c0e307b8

boot/u-boot/u-boot.mk

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(MKIMAGE) 
U_BOOT_ARCH=$(KERNEL_ARCH)



# u-boot in the past used arch=ppc for powerpc

ifneq ($(findstring x200,$(UBOOT_VERSION))$(findstring x2010.03,$(UBOOT_VERSION)),)

ifneq ($(findstring x200,x$(U_BOOT_VERSION))$(findstring x2010.03,x$(U_BOOT_VERSION)),)

U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)

endif
@@ -81,8 +81,6 @@ ifeq ($(U_BOOT_BOARD_NAME),) 
	$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)

endif

	$(TARGET_CONFIGURE_OPTS)		\

		CFLAGS="$(TARGET_CFLAGS)"	\

		LDFLAGS="$(TARGET_LDFLAGS)"	\

		$(U_BOOT_CONFIGURE_OPTS) \

		$(MAKE) -C $(U_BOOT_DIR)	\

		$(U_BOOT_BOARD_NAME)_config