linux/generic: add some missing patches, refresh patches

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

diff --git a/target/linux/avr32/image/Makefile b/target/linux/avr32/image/Makefile
index a001097..595a5d9 100644 (file)
--- a/target/linux/avr32/image/Makefile
+++ b/target/linux/avr32/image/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -7,12 +7,30 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 

+ifneq ($(CONFIG_AVR32_UBOOT),)
+  define Build/Clean
+       $(MAKE) -C u-boot clean
+  endef
+
+  define Build/Compile
+       $(MAKE) -C u-boot compile
+  endef
+endif
+

 define Image/Prepare
        cp $(LINUX_DIR)/arch/avr32/boot/images/uImage $(KDIR)/uImage
 endef
 
 define Image/BuildKernel
 define Image/Prepare
        cp $(LINUX_DIR)/arch/avr32/boot/images/uImage $(KDIR)/uImage
 endef
 
 define Image/BuildKernel

-       cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage
+       cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+
+       $(STAGING_DIR_HOST)/bin/lzma e $(LINUX_DIR)/arch/avr32/boot/images/vmlinux.bin $(KDIR)/vmlinux.lzma
+       mkimage -A avr32 -O linux -T kernel -a 0x10000000 -C lzma \
+               -e 0x90000000 \
+               -n 'OpenWrt Linux-$(LINUX_VERSION)' \
+               -d $(KDIR)/vmlinux.lzma $(KDIR)/uImage-lzma
+
+       cp $(KDIR)/uImage-lzma $(BIN_DIR)/$(IMG_PREFIX)-uImage-lzma

 endef
 
 define Image/Build
 endef
 
 define Image/Build


@@ -24,14 +42,14 @@ define Image/Build/squashfs
        ( \
                dd if=$(KDIR)/uImage bs=1024k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
        ( \
                dd if=$(KDIR)/uImage bs=1024k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img

 endef
 
 define Image/Build/jffs2-64k
        ( \
                dd if=$(KDIR)/uImage bs=1024k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
 endef
 
 define Image/Build/jffs2-64k
        ( \
                dd if=$(KDIR)/uImage bs=1024k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img

 endef
 
 $(eval $(call BuildImage))
 endef
 
 $(eval $(call BuildImage))