Revert bad patch to fix linux rebuild problem

diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 9f9a451809ae9e466d55a0f3e8a13f1a91a7840f..ea53ef072ed43208fbb9b39b4c75de278301c687 100644 (file)
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -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)
 

diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index ea07b2a8c2a018360c44d2d3c0ea8b5d0485c16e..1524577e72e7ff7134cc95e021db8509f50ae8d6 100644 (file)
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -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: