diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-26 10:38:00 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-26 10:38:00 +0000 |
| commit | f529db89dbacb076680474bf014b85900bae789c (patch) | |
| tree | 945b052263000a01d0b61bee4115f4b402033c45 | |
| parent | 2440801bd1e0a9b5b3388aec3dd78056365c70cf (diff) | |
| download | buildroot-novena-f529db89dbacb076680474bf014b85900bae789c.tar.gz buildroot-novena-f529db89dbacb076680474bf014b85900bae789c.zip | |
Revert bad patch to fix linux rebuild problem
| -rw-r--r-- | target/linux/Makefile.in.advanced | 2 | ||||
| -rw-r--r-- | target/u-boot/Makefile.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index 9f9a45180..ea53ef072 100644 --- 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 ea07b2a8c..1524577e7 100644 --- 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: |