X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fat91%2Fimage%2FMakefile;h=77b8b4bf6017ca2d577022a6e987894281081f28;hb=ba797f551daddb8a7e93a5ea6969890e8ce45053;hp=c0239ea050c64f0986c9daf4ed5f702c2befd734;hpb=62ccdcedae255174a46ef74d2e0a887f16ddb30f;p=openwrt-github%2F.git

diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile
index c0239ea050..77b8b4bf60 100644
--- a/target/linux/at91/image/Makefile
+++ b/target/linux/at91/image/Makefile
@@ -1,45 +1,33 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 define Build/Clean
-	$(MAKE) -C dfboot clean
 	$(MAKE) -C u-boot clean
 endef
 
 define Build/Compile
-	$(MAKE) -C dfboot compile
-	$(MAKE) -C u-boot compile
-	$(KDIR)/u-boot-1.1.4/tools/ubparams
-	cp params $(KDIR)
+	if [ $(CONFIG_AT91_UBOOT) ]; then \
+		$(MAKE) -C u-boot compile; \
+	fi
 endef
 
 define Image/Prepare
-  cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
-	cp $(KDIR)/dfboot/dfboot.bin $(KDIR)/dfboot.bin
-	cp $(KDIR)/dfboot/dfbptest.bin $(KDIR)/dfbptest.bin
-	cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin
-	dd if=$(KDIR)/u-boot.bin of=$(KDIR)/u-boot.block bs=100k count=1 conv=sync
-	cat $(KDIR)/u-boot.block $(KDIR)/params > $(KDIR)/u-boot.full
 endef
 
 define Image/BuildKernel
-	cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-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
 endef
 
 define Image/Build
-	dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=8448 conv=sync
-	dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=8448 conv=sync
-	cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin
-	$(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD).trx -f $(KDIR)/dfboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin
-	cp $(KDIR)/dfbptest.bin $(BIN_DIR)
 	$(call Image/Build/$(1),$(1))
+	cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-root.$(1)
 endef
 
 $(eval $(call BuildImage))