Commit f529db89 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Revert bad patch to fix linux rebuild problem

parent 2440801b

target/linux/Makefile.in.advanced

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ $(PROJECT_BUILD_DIR)/.linux-version: $(LINUX26_KERNEL) 
	echo $(LINUX26_VERSION_PROBED) > $(PROJECT_BUILD_DIR)/.linux-version

	echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)`



$(LINUX26_MKIMAGE_DIR)/mkimage:	$(MKIMAGE)

$(LINUX26_MKIMAGE_DIR)/mkimage:	u-boot

	mkdir -p $(LINUX26_MKIMAGE_DIR)

	cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR)

target/u-boot/Makefile.in

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ MKIMAGE:=$(U_BOOT_TOOLS) 
U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript



U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)

#U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN)



ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)

#"))
@@ -289,7 +290,7 @@ $(U_BOOT_AUTOSCRIPT).$(PROJECT): $(U_BOOT_AUTOSCRIPT) $(MKIMAGE) 
#

#############################################################

ifeq ($(BR2_TARGET_UBOOT),y)

TARGETS+=u-boot

TARGETS+=u-boot mkimage

endif



u-boot-status: