X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/da4077f1bc0dadf4dfa7633761c53aed8ca0f2c7..92f1e1a003936d1538258fb7c647e5bf7c8151ca:/target/linux/rb532-2.6/image/Makefile

diff --git a/target/linux/rb532-2.6/image/Makefile b/target/linux/rb532-2.6/image/Makefile
index 27e4357a8..1f3a88ba4 100644
--- a/target/linux/rb532-2.6/image/Makefile
+++ b/target/linux/rb532-2.6/image/Makefile
@@ -20,17 +20,16 @@ LOADER_MAKEOPTS= \
 		RAMSIZE=$(RAMSIZE) \
 		IMAGE_COPY=$(IMAGE_COPY)
 
+define Build/Compile
+	$(CC) -o $(STAGING_DIR)/bin/patch-cmdline $(PLATFORM_DIR)/src/patch-cmdline.c
+endef
+
 define Build/Clean
 	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
 
-CMDLINE_SIZE=512
-CMDLINE_OFFSET=4112
-
 define Image/Prepare
-	echo 'root=/dev/cfa2 ' | \
-		dd bs=$(CMDLINE_SIZE) count=1 conv=sync | \
-		dd of=$(LINUX_DIR)/vmlinux bs=$(CMDLINE_OFFSET) conv=notrunc seek=1
+	$(STAGING_DIR)/bin/patch-cmdline $(LINUX_DIR)/vmlinux 'root=/dev/cfa2 '
 	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
 endef
 
@@ -40,9 +39,6 @@ define Image/BuildKernel
 	$(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux
 endef
 
-PARTITION1=\x80\x01\x01\x00\x27\x01\x20\x7b\x20\x00\x00\x00\xe0\x1e\x00\x00# 4 MB  (kernel part)
-PARTITION2=\x00\x00\x01\x7c\x83\x01\xa0\x64\x00\x1f\x00\x00\x40\x7a\x00\x00# 16 MB (rootfs part)
-
 define Image/cmdline/jffs2-64k
 block2mtd.block2mtd=/dev/cfa2,65536 root=/dev/mtdblock0 rootfstype=jffs2
 endef
@@ -56,21 +52,8 @@ root=/dev/cfa2 rootfstype=ext2
 endef
 
 define Image/Build
-	echo '$(strip $(call Image/cmdline/$(1))) ' | \
-		dd bs=$(CMDLINE_SIZE) count=1 conv=sync | \
-		dd of=$(LINUX_DIR)/vmlinux bs=$(CMDLINE_OFFSET) conv=notrunc seek=1
-	( \
-		echo -ne OWRT | dd bs=$$$$((0x1be)) conv=sync; \
-		( \
-			echo -ne '$(strip $(PARTITION1))'; \
-			echo -ne '$(strip $(PARTITION2))'; \
-		) | dd bs=$$$$((0x40)) conv=sync; \
-		echo -ne '\x55\xaa'; \
-		dd if=/dev/zero bs=$$$$((0x3e00)) conv=sync count=1; \
-		dd if=$(LINUX_DIR)/vmlinux bs=$$$$((0x3dc000)) conv=sync; \
-		cat $(KDIR)/root.$(1); \
-		echo -ne '\xde\xad\xc0\xde'; \
-	) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin
+	$(STAGING_DIR)/bin/patch-cmdline $(LINUX_DIR)/vmlinux '$(strip $(call Image/cmdline/$(1))) '
+	./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin 4 $(LINUX_DIR)/vmlinux 16 $(KDIR)/root.$(1)
 endef
 
 $(eval $(call BuildImage))