aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHamish Guthrie <hcg@openwrt.org>2007-03-23 10:24:01 +0000
committerHamish Guthrie <hcg@openwrt.org>2007-03-23 10:24:01 +0000
commit114bb45bb2cdd9765f3d3836ce1d186db02ba785 (patch)
treed75e552e27baef00c8e554653c557ed4c6727705 /target
parent5a4a7548f786ffc30b1627f83bc34ec6aa6ac7d0 (diff)
downloadupstream-114bb45bb2cdd9765f3d3836ce1d186db02ba785.tar.gz
upstream-114bb45bb2cdd9765f3d3836ce1d186db02ba785.tar.bz2
upstream-114bb45bb2cdd9765f3d3836ce1d186db02ba785.zip
Final image build fixups
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/at91-2.6/image/Makefile9
-rw-r--r--target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch10
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;
+ }
+
+