projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated to new upstream release (v1.3.14)
[openwrt.git] / openwrt / target / linux / linux-2.4 / patches / ar7 / 001-flash_map.patch
diff --git a/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch b/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
index b4aec5f..b454861 100644 (file)
--- a/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
+++ b/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
@@ -1,6 +1,6 @@
-diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/Config.in linux-2.4.30-wag-jiauka/drivers/mtd/maps/Config.in
---- linux-2.4.30-openwrt/drivers/mtd/maps/Config.in    Sun May 29 18:07:48 2005
-+++ linux-2.4.30-wag-jiauka/drivers/mtd/maps/Config.in Thu Jun  9 01:49:32 2005
+diff -urN linux-2.4.30/drivers/mtd/maps/Config.in linux-2.4.30.dev/drivers/mtd/maps/Config.in
+--- linux-2.4.30/drivers/mtd/maps/Config.in    2005-06-14 19:31:49.000000000 +0200
++++ linux-2.4.30.dev/drivers/mtd/maps/Config.in        2005-06-14 15:36:59.000000000 +0200
 @@ -48,6 +48,21 @@
  fi
  
 @@ -48,6 +48,21 @@
  fi
  
@@ -23,9 +23,9 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/Config.in linux-2.4.30-wag-jiauk
     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
     dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
     dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
-diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/Makefile linux-2.4.30-wag-jiauka/drivers/mtd/maps/Makefile
---- linux-2.4.30-openwrt/drivers/mtd/maps/Makefile     Sun May 29 18:07:48 2005
-+++ linux-2.4.30-wag-jiauka/drivers/mtd/maps/Makefile  Thu Jun  9 01:49:32 2005
+diff -urN linux-2.4.30/drivers/mtd/maps/Makefile linux-2.4.30.dev/drivers/mtd/maps/Makefile
+--- linux-2.4.30/drivers/mtd/maps/Makefile     2005-06-14 19:31:49.000000000 +0200
++++ linux-2.4.30.dev/drivers/mtd/maps/Makefile 2005-06-14 15:36:59.000000000 +0200
 @@ -10,6 +10,7 @@
  endif
  
 @@ -10,6 +10,7 @@
  endif
  
@@ -34,10 +34,10 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/Makefile linux-2.4.30-wag-jiauka
  obj-$(CONFIG_MTD_CDB89712)    += cdb89712.o
  obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
  obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
  obj-$(CONFIG_MTD_CDB89712)    += cdb89712.o
  obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
  obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
-diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c linux-2.4.30-wag-jiauka/drivers/mtd/maps/ar7-flash.c
---- linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c  Thu Jan  1 01:00:00 1970
-+++ linux-2.4.30-wag-jiauka/drivers/mtd/maps/ar7-flash.c       Thu Jun  9 01:49:32 2005
-@@ -0,0 +1,208 @@
+diff -urN linux-2.4.30/drivers/mtd/maps/ar7-flash.c linux-2.4.30.dev/drivers/mtd/maps/ar7-flash.c
+--- linux-2.4.30/drivers/mtd/maps/ar7-flash.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30.dev/drivers/mtd/maps/ar7-flash.c      2005-06-14 22:42:23.000000000 +0200
+@@ -0,0 +1,245 @@
 +/*
 + * $Id$
 + *
 +/*
 + * $Id$
 + *
@@ -52,6 +52,7 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c linux-2.4.30-wag-jia
 +#include <linux/mtd/map.h>
 +#include <linux/config.h>
 +#include <linux/mtd/partitions.h>
 +#include <linux/mtd/map.h>
 +#include <linux/config.h>
 +#include <linux/mtd/partitions.h>
++#include "trxhdr.h"
 +
 +#define WINDOW_ADDR CONFIG_MTD_AVALANCHE_START
 +#define WINDOW_SIZE CONFIG_MTD_AVALANCHE_LEN
 +
 +#define WINDOW_ADDR CONFIG_MTD_AVALANCHE_START
 +#define WINDOW_SIZE CONFIG_MTD_AVALANCHE_LEN
@@ -176,6 +177,7 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c linux-2.4.30-wag-jia
 +      unsigned int found;
 +      unsigned char *flash_base;
 +      unsigned char *flash_end;
 +      unsigned int found;
 +      unsigned char *flash_base;
 +      unsigned char *flash_end;
++      struct trx_header hdr;
 +      char *env_ptr;
 +      char *base_ptr;
 +      char *end_ptr;
 +      char *env_ptr;
 +      char *base_ptr;
 +      char *end_ptr;
@@ -187,7 +189,8 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c linux-2.4.30-wag-jia
 +
 +              /* get base and end addresses of flash file system from environment */
 +              sprintf(env_name, "mtd%1u", num_of_partitions);
 +
 +              /* get base and end addresses of flash file system from environment */
 +              sprintf(env_name, "mtd%1u", num_of_partitions);
-+printk("Looking for mtd device :%s:\n", env_name);
++              printk("Looking for mtd device :%s:\n", env_name);
++
 +              env_ptr = prom_getenv(env_name);
 +              if(env_ptr == NULL) {
 +                      /* No more partitions to find */
 +              env_ptr = prom_getenv(env_name);
 +              if(env_ptr == NULL) {
 +                      /* No more partitions to find */
@@ -214,10 +217,44 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c linux-2.4.30-wag-jia
 +              printk("Found a %s image (0x%x), with size (0x%x).\n",env_name, offset, size);
 +
 +              /* Setup the partition info. We duplicate the env_name for the partiton name */
 +              printk("Found a %s image (0x%x), with size (0x%x).\n",env_name, offset, size);
 +
 +              /* Setup the partition info. We duplicate the env_name for the partiton name */
-+              avalanche_partition_info[num_of_partitions].name = strdup(env_name);
 +              avalanche_partition_info[num_of_partitions].offset = offset;
 +              avalanche_partition_info[num_of_partitions].size = size;
 +              avalanche_partition_info[num_of_partitions].mask_flags = 0;
 +              avalanche_partition_info[num_of_partitions].offset = offset;
 +              avalanche_partition_info[num_of_partitions].size = size;
 +              avalanche_partition_info[num_of_partitions].mask_flags = 0;
++              
++              switch (num_of_partitions ) {
++                      case 0:
++                              avalanche_partition_info[num_of_partitions].name = strdup("rootfs");
++                              avalanche_copy_from(&avalanche_map, &hdr, offset, sizeof(hdr));
++                              if (hdr.magic == TRX_MAGIC) {
++                                      printk("TRX partition detected. First offset: %08x\n", hdr.offsets[0]);
++                                      avalanche_partition_info[num_of_partitions].offset += hdr.offsets[0];
++                                      avalanche_partition_info[num_of_partitions].size -= hdr.offsets[0];
++                              } else {
++                                      printk("No TRX partition detected\n");
++                              }
++                              break;
++                              
++                      case 1:
++                              avalanche_partition_info[num_of_partitions].name = strdup("linux");
++                              break;
++                              
++                      case 2:
++                              avalanche_partition_info[num_of_partitions].name = strdup("adam2");
++                              break;
++                              
++                      case 3:
++                              avalanche_partition_info[num_of_partitions].name = strdup("config");
++                              break;
++                      
++                      case 4:
++                              avalanche_partition_info[num_of_partitions].name = strdup("firmware");
++                              break;
++
++                      default:
++                              avalanche_partition_info[num_of_partitions].name = strdup(env_name);
++                              break;
++              }
++              
 +              num_of_partitions++;
 +      } while (num_of_partitions < MAX_NUM_PARTITIONS);
 +
 +              num_of_partitions++;
 +      } while (num_of_partitions < MAX_NUM_PARTITIONS);
 +
@@ -246,3 +283,36 @@ diff -Nru linux-2.4.30-openwrt/drivers/mtd/maps/ar7-flash.c linux-2.4.30-wag-jia
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Snehaprabha Narnakaje");
 +MODULE_DESCRIPTION("Avalanche CFI map driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Snehaprabha Narnakaje");
 +MODULE_DESCRIPTION("Avalanche CFI map driver");
+diff -urN linux-2.4.30/drivers/mtd/maps/trxhdr.h linux-2.4.30.dev/drivers/mtd/maps/trxhdr.h
+--- linux-2.4.30/drivers/mtd/maps/trxhdr.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30.dev/drivers/mtd/maps/trxhdr.h 2005-06-14 21:57:04.000000000 +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 */
++};
Personal OpenWRT clone
This page took 0.061443 seconds and 4 git commands to generate.