diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-14 21:08:26 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-14 21:08:26 +0200 |
| commit | 1acd72a1ab7b1f9cac453d29ec55a6676a16f15b (patch) | |
| tree | 076ce2caab82463ff9276ebeadf38c3cef6937d6 /boot | |
| parent | c0e307b848d8de23e6f10a179c4f240c023c8b82 (diff) | |
u-boot: fix version detection and get rid of unneeded double CFLAGS/LDFLAGS
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/u-boot/u-boot.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 37ed21557..c21166fe7 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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 |