1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-07-04 23:30:43 +03:00

Final image build fixups

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6644 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hcg 2007-03-23 10:24:01 +00:00
parent e2b0a0cc9a
commit 6ca9d74875
2 changed files with 18 additions and 1 deletions

View File

@ -17,13 +17,16 @@ define Build/Compile
$(MAKE) -C romboot compile
# $(MAKE) -C u-boot configure
$(MAKE) -C u-boot compile
$(KDIR)/u-boot-1.1.4/tools/ubparams
cp params $(KDIR)
endef
define Image/Prepare
cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
cp $(KDIR)/romboot/romboot.bin $(KDIR)/romboot.bin
cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin
cat $(KDIR)/romboot/romboot.block $(KDIR)/u-boot-1.1.4/u-boot.block > $(KDIR)/loaders.block
dd if=$(KDIR)/u-boot.bin of=$(KDIR)/u-boot.block bs=100k count=1 conv=sync
cat $(KDIR)/u-boot.block $(KDIR)/params > $(KDIR)/u-boot.full
endef
define Image/BuildKernel
@ -31,6 +34,10 @@ define Image/BuildKernel
endef
define Image/Build
dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=1056k count=1 conv=sync
dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=1056k count=1 conv=sync
cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin
$(STAGING_DIR)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).trx -f $(KDIR)/romboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin
$(call Image/Build/$(1),$(1))
endef

View File

@ -0,0 +1,10 @@
--- u-boot-1.1.4.old/tools/ubparams.c 2007-03-23 10:51:17.000000000 +0100
+++ u-boot-1.1.4/tools/ubparams.c 2007-03-23 10:49:37.000000000 +0100
@@ -73,6 +73,7 @@
fclose(params);
free(envptr);
+ return 0;
}