diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2007-03-23 10:24:01 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2007-03-23 10:24:01 +0000 |
| commit | f63dd06ad7c7f13dd0372a5886235c8f04366ad2 (patch) | |
| tree | a31fb8ed66dcce446c84c1c3278824f79ed73052 | |
| parent | eef27d8466812021f785f2c1b26f8907834ac249 (diff) | |
| download | upstream-f63dd06ad7c7f13dd0372a5886235c8f04366ad2.tar.gz upstream-f63dd06ad7c7f13dd0372a5886235c8f04366ad2.tar.bz2 upstream-f63dd06ad7c7f13dd0372a5886235c8f04366ad2.zip | |
Final image build fixups
SVN-Revision: 6644
| -rw-r--r-- | target/linux/at91-2.6/image/Makefile | 9 | ||||
| -rw-r--r-- | target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch | 10 |
2 files changed, 18 insertions, 1 deletions
diff --git a/target/linux/at91-2.6/image/Makefile b/target/linux/at91-2.6/image/Makefile index 8b1a9476d7..9a9948eaef 100644 --- a/target/linux/at91-2.6/image/Makefile +++ b/target/linux/at91-2.6/image/Makefile @@ -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 diff --git a/target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch b/target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch new file mode 100644 index 0000000000..9a16e1998f --- /dev/null +++ b/target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch @@ -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; + } + + |