EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove trx stuff from ar7 images and flash map

Browse Source 
SVN-Revision: 1524
This commit is contained in:
Felix Fietkau 2005-07-21 18:46:19 +00:00
parent c534539555
commit b80218af6a
2 changed files with 31 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openwrt/target/linux/image/ar7/Makefile
View File

@ -41,19 +41,17 @@ $(BIN_DIR)/openwrt-ar7-zimage.bin: $(KDIR)/vmlinux.gz compile
-o $(KDIR)/loader -o $(KDIR)/loader
$(TARGET_CROSS)objcopy -O srec $(KDIR)/loader $(KDIR)/ram_zimage.sre $(TARGET_CROSS)objcopy -O srec $(KDIR)/loader $(KDIR)/ram_zimage.sre
$(PKG_BUILD_DIR)/srec2bin $(KDIR)/ram_zimage.sre $@ $(PKG_BUILD_DIR)/srec2bin $(KDIR)/ram_zimage.sre $@
dd if=/dev/zero bs=1024 count=1 >> $@
ALIGN:=1024
ifeq ($(FS),jffs2-8MB) ifeq ($(FS),jffs2-8MB)
ALIGN:=131072 ALIGN:=bs=131072 conv=sync
endif endif
ifeq ($(FS),jffs2-4MB) ifeq ($(FS),jffs2-4MB)
ALIGN:=65536 ALIGN:=bs=65536 conv=sync
endif endif
$(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin: $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin:
dd if=$(BIN_DIR)/openwrt-ar7-zimage.bin bs=$(ALIGN) conv=sync | head -c -1024 > $@ dd if=$(BIN_DIR)/openwrt-ar7-zimage.bin $(ALIGN) > $@
$(STAGING_DIR)/bin/trx -a 1024 $(BUILD_DIR)/linux-$(KERNEL)-ar7/root.$(FS) >> $@ cat $(BUILD_DIR)/linux-$(KERNEL)-ar7/root.$(FS) >> $@
define pattern_template define pattern_template
$(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS)-$(1).bin: $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS)-$(1).bin: $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin

90
openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
View File

@ -1,7 +1,7 @@
diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-flash.c diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-flash.c
--- linux.old/drivers/mtd/maps/ar7-flash.c 1970-01-01 01:00:00.000000000 +0100 --- linux.old/drivers/mtd/maps/ar7-flash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/drivers/mtd/maps/ar7-flash.c 2005-07-21 09:01:39.994240680 +0200 +++ linux.dev/drivers/mtd/maps/ar7-flash.c 2005-07-22 04:35:26.624453992 +0200
@@ -0,0 +1,272 @@ @@ -0,0 +1,265 @@
+/* +/*
+ * $Id$ + * $Id$
+ * + *
@ -16,7 +16,7 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
+#include <linux/mtd/map.h> +#include <linux/mtd/map.h>
+#include <linux/config.h> +#include <linux/config.h>
+#include <linux/mtd/partitions.h> +#include <linux/mtd/partitions.h>
+#include "trxhdr.h" +#include <linux/squashfs_fs.h>
+ +
+#define WINDOW_ADDR CONFIG_MTD_AR7_START +#define WINDOW_ADDR CONFIG_MTD_AR7_START
+#define WINDOW_SIZE CONFIG_MTD_AR7_LEN +#define WINDOW_SIZE CONFIG_MTD_AR7_LEN
@ -136,7 +136,6 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
+ unsigned int p = 0; + unsigned int p = 0;
+ unsigned char *flash_base; + unsigned char *flash_base;
+ unsigned char *flash_end; + unsigned char *flash_end;
+ struct trx_header hdr;
+ char *env_ptr; + char *env_ptr;
+ char *base_ptr; + char *base_ptr;
+ char *end_ptr; + char *end_ptr;
@ -186,7 +185,7 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
+ if (config_offset > offset) + if (config_offset > offset)
+ config_offset = offset; // reserved at the end of the flash chip + config_offset = offset; // reserved at the end of the flash chip
+ } else if (offset > 0x30000) { + } else if (offset > 0x30000) {
+ printk("Assuming rootfs offset of 0x%x\n", offset); + printk("Assuming default rootfs offset of 0x%x\n", offset);
+ rootfs_start = offset; // probably root fs + rootfs_start = offset; // probably root fs
+ } + }
+ +
@ -205,27 +204,15 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
+ ar7_partinfo[p].size = config_offset - adam2_size; + ar7_partinfo[p].size = config_offset - adam2_size;
+ ar7_partinfo[p++].mask_flags = 0; + ar7_partinfo[p++].mask_flags = 0;
+ +
+ for (offset = adam2_size; !found && (offset < rootfs_start); offset += 1024) { + if (ar7_read32(&ar7_map, adam2_size) == 0xfeedfa42) {
+ if (ar7_read32(&ar7_map, offset) == TRX_MAGIC) { + rootfs_start = ar7_read32(&ar7_map, adam2_size + 4) + adam2_size + 28;
+ found = 1; + printk("Setting new rootfs offset to %08x\n", rootfs_start);
+ rootfs_start = offset;
+ }
+ } + }
+ +
+ ar7_partinfo[p].name = strdup("rootfs"); + ar7_partinfo[p].name = strdup("rootfs");
+ ar7_partinfo[p].offset = rootfs_start; + ar7_partinfo[p].offset = rootfs_start;
+ ar7_partinfo[p].size = config_offset - rootfs_start; + ar7_partinfo[p].size = config_offset - rootfs_start;
+ +
+ ar7_copy_from(&ar7_map, &hdr, rootfs_start, sizeof(hdr));
+ if (hdr.magic == TRX_MAGIC) {
+ printk("TRX header in rootfs partition detected.\n");
+ printk("offset[0] = 0x%05x\n", hdr.offsets[0]);
+ printk("offset[1] = 0x%05x\n", hdr.offsets[1]);
+ printk("offset[2] = 0x%05x\n", hdr.offsets[2]);
+ ar7_partinfo[p].offset += hdr.offsets[0];
+ ar7_partinfo[p].size -= hdr.offsets[0];
+ }
+
+ ar7_partinfo[p++].mask_flags = 0; + ar7_partinfo[p++].mask_flags = 0;
+ +
+ ar7_partinfo[p].name = strdup("config"); + ar7_partinfo[p].name = strdup("config");
@ -233,24 +220,30 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
+ ar7_partinfo[p].size = WINDOW_SIZE - config_offset; + ar7_partinfo[p].size = WINDOW_SIZE - config_offset;
+ ar7_partinfo[p++].mask_flags = 0; + ar7_partinfo[p++].mask_flags = 0;
+ +
+ if (ar7_read32(&ar7_map, rootfs_start + hdr.offsets[0]) == 0x73717368) { + if (ar7_read32(&ar7_map, rootfs_start) == SQUASHFS_MAGIC) {
+ int newsize; + int newsize, newoffset;
+ squashfs_super_block sb;
+ +
+ printk("Squashfs detected. Adding extra partition\n"); + ar7_copy_from(&ar7_map, &sb, rootfs_start, sizeof(sb));
+ newsize = hdr.len; + printk("Squashfs detected (size = 0x%08x)\n", sb.bytes_used);
+ if (newsize % ar7_mtd_info->erasesize)
+ newsize += ar7_mtd_info->erasesize - ((newsize + hdr.offsets[0]) % ar7_mtd_info->erasesize);
+ +
+ newoffset = rootfs_start + sb.bytes_used;
+
+ if ((newoffset % ar7_mtd_info->erasesize) > 0)
+ newoffset += ar7_mtd_info->erasesize - (newoffset % ar7_mtd_info->erasesize);
+
+ ar7_partinfo[p - 2].size = newoffset - rootfs_start;
+ +
+ ar7_partinfo[p].name = strdup("OpenWrt"); + ar7_partinfo[p].name = strdup("OpenWrt");
+ ar7_partinfo[p].offset = rootfs_start + newsize; + ar7_partinfo[p].offset = newoffset;
+ ar7_partinfo[p].size = ar7_partinfo[p - 2].size + hdr.offsets[0] - newsize; + ar7_partinfo[p].size = config_offset - newoffset;
+ ar7_partinfo[p - 2].size = newsize - hdr.offsets[0]; + ar7_partinfo[p++].mask_flags = 0;
+ + } else {
+ p++; + printk("Unknown filesystem. Moving rootfs partition to next erase block");
+ if ((rootfs_start % ar7_mtd_info->erasesize) > 0)
+ rootfs_start += ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
+ } + }
+ +
+
+ return p; + return p;
+} +}
+ +
@ -310,36 +303,3 @@ diff -urN linux.old/drivers/mtd/maps/Makefile linux.dev/drivers/mtd/maps/Makefil
obj-$(CONFIG_MTD_CDB89712) += cdb89712.o obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
diff -urN linux.old/drivers/mtd/maps/trxhdr.h linux.dev/drivers/mtd/maps/trxhdr.h
--- linux.old/drivers/mtd/maps/trxhdr.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/drivers/mtd/maps/trxhdr.h 2005-07-10 20:50:43.550827000 +0200
@@ -0,0 +1,29 @@
+/*
+ * TRX image file header format.
+ *
+ * Copyright 2005, Broadcom Corporation
+ * All Rights Reserved.
+ *
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+
+#define TRX_MAGIC 0x30524448 /* "HDR0" */
+#define TRX_VERSION 1
+#define TRX_MAX_LEN 0x3A0000
+#define TRX_NO_HEADER 1 /* Do not write TRX header */
+#define TRX_GZ_FILES 0x2 /* Contains up to TRX_MAX_OFFSET individual gzip files */
+#define TRX_MAX_OFFSET 3
+
+struct trx_header {
+ __u32 magic; /* "HDR0" */
+ __u32 len; /* Length of file including header */
+ __u32 crc32; /* 32-bit CRC from flag_version to end of file */
+ __u32 flag_version; /* 0:15 flags, 16:31 version */
+ __u32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions from start of header */
+};