summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-16 12:38:55 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-16 12:38:55 +0000
commit301e8e639ca42d1d36b2f3a565b833ce4a9dabbe (patch)
treecf4ff3caf29fb9e49f55da1c93a54d1903bc9f4a
parent07d64ac0ad3f412d234b7179f858b40f7d5ec579 (diff)
fixup machid workaround, generate uImage manually
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11497 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/orion/Makefile2
-rw-r--r--target/linux/orion/image/Makefile7
2 files changed, 5 insertions, 4 deletions
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