X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/de2c2b0b71d6c61d6070c5594ac9a73d7c69dc8a..072012a0cb3940a49497875c64115b888a8c0114:/target/linux/xburst/image/Makefile

diff --git a/target/linux/xburst/image/Makefile b/target/linux/xburst/image/Makefile
index 0947db054..9c03b3809 100644
--- a/target/linux/xburst/image/Makefile
+++ b/target/linux/xburst/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk
 
 JFFS2_BLOCKSIZE=256k 512k
 
-ifneq ($(CONFIG_TARGET_QI_LB60),)
+ifneq ($(CONFIG_TARGET_xburst_qi_lb60),)
 UBIFS_OPTS = -m 4096 -e 516096 -c 4095
 UBINIZE_OPTS = -m 4096 -p 512KiB
 else
@@ -17,18 +17,22 @@ UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 UBINIZE_OPTS = -m 2048 -p 128KiB -s 512
 endif
 
-ifneq ($(CONFIG_XBURST_UBOOT),)
-  define Build/Clean
-	$(MAKE) -C u-boot clean
-  endef
+UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage.bin
 
-  define Build/Compile
-	$(MAKE) -C u-boot compile
-  endef
-endif
+define kernel_entry
+0x$(shell $(TARGET_CROSS)nm $(1) 2>/dev/null | grep " kernel_entry" | cut -f1 -d ' ')
+endef
+
+
+define MkImageGzip
+	gzip -9 -c $(1) > $(1).gz
+	mkimage -A mips -O linux -T kernel -a 0x80010000 -C gzip \
+		-e $(call kernel_entry,$(LINUX_DIR)/vmlinux) -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+		-d $(1).gz $(2)
+endef
 
 define Image/BuildKernel
-	cp $(KDIR)/linux-$(LINUX_VERSION)/arch/mips/boot/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage.bin
+	$(call MkImageGzip,$(KDIR)/vmlinux,$(UIMAGE))
 endef
 
 define Image/Build/squashfs
@@ -36,7 +40,7 @@ define Image/Build/squashfs
 endef
 
 define Image/Build
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(SUBTARGET)-root.$(1) bs=128k conv=sync
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 endef
 
 $(eval $(call BuildImage))