X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fc35f54386655faec7483c691ca12c00c226a813..ae1f46d43dfb8e013d29aff091b7261a8a420367:/target/linux/orion/image/Makefile

diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 073c24f63..a8c2fbaff 100644
--- a/target/linux/orion/image/Makefile
+++ b/target/linux/orion/image/Makefile
@@ -8,15 +8,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 define Image/Prepare
-	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
+#
+# XXX - FIXME, we hardcode for the WRT350N v2 for now
+#
+	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
-#
-# XXX - FIXME
-#
-#	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh
 endef
 
 define Image/Build
@@ -26,7 +29,7 @@ endef
 define Image/Build/squashfs
 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 	( \
-		dd if=$(LINUX_DIR)/arch/arm/boot/uImage bs=1024k conv=sync; \
+		dd if=$(KDIR)/uImage bs=1024k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
 endef