summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-19 13:18:48 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-19 13:18:48 +0000
commitc4a76c3879ee25ca001322982eb93c27049fcf45 (patch)
tree24c36cd0b8c1a791fc511888dd30f4c3a86da947 /target
parent830019a853415b86f776385dfce83ccd2d6d14da (diff)
[brcm63xx] make images that can be flashed using the stock firmware web interface, thanks to Anselmo Luginbuhl and Daniel Dickinson (#4909, #4943)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15253 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm_tag.h14
-rw-r--r--target/linux/brcm63xx/image/Makefile4
2 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm_tag.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm_tag.h
index efc4f02ba..7c170c05d 100644
--- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm_tag.h
+++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm_tag.h
@@ -14,17 +14,21 @@ struct bcm_tag {
unsigned char totalLength[IMAGE_LEN]; //Total length of image
unsigned char cfeAddress[ADDRESS_LEN]; // Address in memory of CFE
unsigned char cfeLength[IMAGE_LEN]; // Size of CFE
- unsigned char rootAddress[ADDRESS_LEN]; // Address in memory of rootfs
- unsigned char rootLength[IMAGE_LEN]; // Size of rootfs
+ unsigned char cfeRootAddress[ADDRESS_LEN]; // Address in memory of rootfs
+ unsigned char cfeRootLength[IMAGE_LEN]; // Size of rootfs
unsigned char kernelAddress[ADDRESS_LEN]; // Address in memory of kernel
unsigned char kernelLength[IMAGE_LEN]; // Size of kernel
unsigned char dualImage[2]; // Unused at present
unsigned char inactiveFlag[2]; // Unused at present
unsigned char reserved1[74]; // Reserved area not in use
unsigned char imageCRC[4]; // CRC32 of images
- unsigned char reserved2[16]; // Unused at present
- unsigned char headerCRC[4]; // CRC32 of header excluding tagVersion
- unsigned char reserved3[16]; // Unused at present
+// unsigned char reserved2[16]; // Unused at present
+ unsigned char reserved2[4]; //Unused
+ unsigned char rootAddress[ADDRESS_LEN]; // Address in memory of rootfs
+ unsigned char headerCRC[4]; // CRC32 of header excluding tagVersion
+// unsigned char reserved3[16]; // Unused at present
+ unsigned char reserved3[6]; // Unused at present
+ unsigned char rootLength[IMAGE_LEN]; // Size of rootfs
};
#endif /* __BCM63XX_TAG_H */
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 871409626..7c4ed4644 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -34,7 +34,6 @@ define Image/Build/CFE
-b $(2) -c $(3) -e $(LOADADDR) -l $(LOADADDR)
# -b $(2) -c $(3) -e $(KERNEL_ENTRY) -l $(LOADADDR)
- $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin)
endef
define Image/Build/CFEAGPF
@@ -42,8 +41,7 @@ define Image/Build/CFEAGPF
$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
-o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin \
-b $(2) -c $(3) -e $(LOADADDR) -l $(LOADADDR) \
- -v 8 -m IMAGE -k 0x20000 -n $(4)
- $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin)
+ -v 8 -m IMAGE -k 0x20000 -n $(4) -p alice
endef
define Image/Build/RedBoot