From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 16 Jun 2008 12:38:55 +0000 (+0000)
Subject: fixup machid workaround, generate uImage manually
X-Git-Tag: reboot~26283
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e147bf8fa3c6e9023fbda64bfeb95de2910ab656;p=oweals%2Fopenwrt.git

fixup machid workaround, generate uImage manually

SVN-Revision: 11497
---

diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index f2293b8f14..8b18cccb17 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -15,8 +15,6 @@ LINUX_VERSION:=2.6.26-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
-KERNELNAME:="uImage"
-
 DEFAULT_PACKAGES += kmod-madwifi
 
 define Kernel/Configure
diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 073317fecd..a8c2fbafff 100644
--- a/target/linux/orion/image/Makefile
+++ b/target/linux/orion/image/Makefile
@@ -11,11 +11,14 @@ define Image/Prepare
 #
 # XXX - FIXME, we hardcode for the WRT350N v2 for now
 #
-	echo -en "\x61\x70\xa0\xe3\x06\x7c\x87\xe3" > $(KDIR)/uImage
-	cat $(LINUX_DIR)/arch/arm/boot/uImage >> $(KDIR)/uImage
+	echo -en "\x61\x70\xa0\xe3\x06\x7c\x87\xe3" > $(KDIR)/zImage
+	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/zImage
 endef
 
 define Image/BuildKernel
+	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
+	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
+	-d $(KDIR)/zImage $(KDIR)/uImage
 	cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
 endef