fixup machid workaround, generate uImage manually

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11497 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index f2293b8..8b18ccc 100644 (file)
--- 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
 
 
 include $(INCLUDE_DIR)/target.mk
 

-KERNELNAME:="uImage"
-

 DEFAULT_PACKAGES += kmod-madwifi
 
 define Kernel/Configure
 DEFAULT_PACKAGES += kmod-madwifi
 
 define Kernel/Configure

diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 073317f..a8c2fba 100644 (file)
--- 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
 #
 #
 # 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
 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
 
        cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
 endef