targets: fix CONFIG_USB_STORAGE_* inconsistency

[openwrt.git] / target / linux / at91 / image / Makefile

diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile
index 433dad8..c50732c 100644 (file)
--- a/target/linux/at91/image/Makefile
+++ b/target/linux/at91/image/Makefile
@@ -8,20 +8,29 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 define Build/Clean
+       $(MAKE) -C u-boot clean
 endef
 
 define Build/Compile
+       if [ $(CONFIG_AT91_UBOOT) ]; then \
+               $(MAKE) -C u-boot compile; \
+       fi
 endef
 
 define Image/Prepare
 endef
 
 define Image/BuildKernel
-       cp $(LINUX_DIR)/arch/arm/boot/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+       mkimage -A arm -T kernel -C none -a 0x20008000 -e 0x20008000 -n linux-2.6 \
+               -d $(LINUX_DIR)/arch/arm/boot/Image $(BIN_DIR)/$(IMG_PREFIX)-uImage
+       if [ $(CONFIG_FLEXIBITY_ROOT) ]; then \
+               $(INSTALL_BIN) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/uImage ; \
+       fi
 endef
 
 define Image/Build
        $(call Image/Build/$(1),$(1))
+       cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-root.$(1)
 endef
 
 $(eval $(call BuildImage))