ar71xx: rename wrt160nl's trx partition parser

This patch renames the partition parser from
wrt160nl to more generic cybertan.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
SVN-Revision: 44663

diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14
index ec98767472c6f5c4cc6c39a132ac9fcbcea70824..e4e598f8c7768ce9ef5468bc6d87dadf81ec7a43 100644 (file)
--- a/target/linux/ar71xx/config-3.14
+++ b/target/linux/ar71xx/config-3.14
@@ -254,7 +254,7 @@ CONFIG_MTD_SPLIT_LZMA_FW=y
 CONFIG_MTD_SPLIT_SEAMA_FW=y
 CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_MTD_TPLINK_PARTS=y
-CONFIG_MTD_WRT160NL_PARTS=y
+CONFIG_MTD_CYBERTAN_PARTS=y
 CONFIG_MYLOADER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y

diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
index f881a292f05ea51b0b40287aff79b2f2c1b207f7..5c25f32f28a3fdf81c1e2b489933daea56456d4c 100644 (file)
--- a/target/linux/ar71xx/config-3.18
+++ b/target/linux/ar71xx/config-3.18
@@ -257,7 +257,7 @@ CONFIG_MTD_SPLIT_LZMA_FW=y
 CONFIG_MTD_SPLIT_SEAMA_FW=y
 CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_MTD_TPLINK_PARTS=y
-CONFIG_MTD_WRT160NL_PARTS=y
+CONFIG_MTD_CYBERTAN_PARTS=y
 CONFIG_MYLOADER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
index 21aefe00a0924f04bf8f2e30ad0ec2f3806dd898..ede3c214c272fdbe539430869ee338122b10f649 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
@@ -34,7 +34,7 @@
 #define WRT160NL_NVRAM_SIZE    0x10000
 
 static const char *wrt160nl_part_probes[] = {
-       "wrt160nl",
+       "cybertan",
        NULL,
 };
 

diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
similarity index 86%
rename from target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
rename to target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
index 698bba87ea9b143b6a40881306b9e918aae57e3b..e03967a98b8f109a3f79a8d71aa5a40d8f819e19 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
+++ b/target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
@@ -61,7 +61,7 @@ struct uimage_header {
        uint32_t        ih_hcrc;        /* Image Header CRC Checksum */
        uint32_t        ih_time;        /* Image Creation Timestamp */
        uint32_t        ih_size;        /* Image Data Size */
-       uint32_t        ih_load;        /* Data» Load  Address */
+       uint32_t        ih_load;        /* Data» Load  Address */
        uint32_t        ih_ep;          /* Entry Point Address */
        uint32_t        ih_dcrc;        /* Image Data CRC Checksum */
        uint8_t         ih_os;          /* Operating System */
@@ -71,21 +71,21 @@ struct uimage_header {
        uint8_t         ih_name[IH_NMLEN];      /* Image Name */
 };
 
-struct wrt160nl_header {
+struct firmware_header {
        struct cybertan_header  cybertan;
        struct trx_header       trx;
        struct uimage_header    uimage;
-} __attribute__ ((packed));
+} __packed;
 
-#define WRT160NL_UBOOT_LEN     0x40000
-#define WRT160NL_ART_LEN       0x10000
-#define WRT160NL_NVRAM_LEN     0x10000
+#define UBOOT_LEN      0x40000
+#define ART_LEN                0x10000
+#define NVRAM_LEN      0x10000
 
-static int wrt160nl_parse_partitions(struct mtd_info *master,
+static int cybertan_parse_partitions(struct mtd_info *master,
                                     struct mtd_partition **pparts,
                                     struct mtd_part_parser_data *data)
 {
-       struct wrt160nl_header *header;
+       struct firmware_header *header;
        struct trx_header *theader;
        struct uimage_header *uheader;
        struct mtd_partition *trx_parts;
@@ -96,9 +96,9 @@ static int wrt160nl_parse_partitions(struct mtd_info *master,
        unsigned int art_len;
        int ret;
 
-       uboot_len = max_t(unsigned int, master->erasesize, WRT160NL_UBOOT_LEN);
-       nvram_len = max_t(unsigned int, master->erasesize, WRT160NL_NVRAM_LEN);
-       art_len = max_t(unsigned int, master->erasesize, WRT160NL_ART_LEN);
+       uboot_len = max_t(unsigned int, master->erasesize, UBOOT_LEN);
+       nvram_len = max_t(unsigned int, master->erasesize, NVRAM_LEN);
+       art_len = max_t(unsigned int, master->erasesize, ART_LEN);
 
        trx_parts = kzalloc(TRX_PARTS * sizeof(struct mtd_partition),
                            GFP_KERNEL);
@@ -125,7 +125,7 @@ static int wrt160nl_parse_partitions(struct mtd_info *master,
 
        if (strncmp(header->cybertan.magic, "NL16", 4) != 0) {
                printk(KERN_NOTICE "%s: no WRT160NL signature found\n",
-                       master->name);
+                      master->name);
                goto free_hdr;
        }
 
@@ -188,20 +188,20 @@ out:
        return ret;
 }
 
-static struct mtd_part_parser wrt160nl_parser = {
+static struct mtd_part_parser cybertan_parser = {
        .owner          = THIS_MODULE,
-       .parse_fn       = wrt160nl_parse_partitions,
-       .name           = "wrt160nl",
+       .parse_fn       = cybertan_parse_partitions,
+       .name           = "cybertan",
 };
 
-static int __init wrt160nl_parser_init(void)
+static int __init cybertan_parser_init(void)
 {
-       register_mtd_parser(&wrt160nl_parser);
+       register_mtd_parser(&cybertan_parser);
 
        return 0;
 }
 
-module_init(wrt160nl_parser_init);
+module_init(cybertan_parser_init);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Christian Daniel <cd@maintech.de>");

diff --git a/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-3.14/404-mtd-cybertan-trx-parser.patch
similarity index 77%
rename from target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
rename to target/linux/ar71xx/patches-3.14/404-mtd-cybertan-trx-parser.patch
index b5f4b529aff5d40b0b19b7d319bb622236f18b85..7995abbb458769d92e9a40d65d663a4fca7a4469 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-3.14/404-mtd-cybertan-trx-parser.patch
@@ -4,11 +4,11 @@
          This provides partitions parser for devices based on BCM47xx
          boards.
  
-+config MTD_WRT160NL_PARTS
-+      tristate "Linksys WRT160NL partitioning support"
-+      depends on ATH79_MACH_WRT160NL
++config MTD_CYBERTAN_PARTS
++      tristate "Cybertan partitioning support"
++      depends on ATH79
 +      ---help---
-+         Linksys WRT160NL partitioning support
++         Cybertan partitioning support
 +
  config MTD_MYLOADER_PARTS
        tristate "MyLoader partition parsing"
@@ -19,7 +19,7 @@
  obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
  obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
  obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
-+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
++obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o
  
  # 'Users' - code which presents functionality to userspace.
  obj-$(CONFIG_MTD_BLKDEVS)     += mtd_blkdevs.o

diff --git a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
index 74e79ea7706c0f5b0b8d7f20bd913e0a72d1065f..c43c5055d9ff42639a113c6e4116715815908aa5 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
+++ b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
@@ -20,6 +20,6 @@
  obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
  obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
 +obj-$(CONFIG_MTD_TPLINK_PARTS)        += tplinkpart.o
- obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
+ obj-$(CONFIG_MTD_WRT160NL_PARTS) += cybertan_part.o
  
  # 'Users' - code which presents functionality to userspace.

diff --git a/target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-3.18/404-mtd-cybertan-trx-parser.patch
similarity index 77%
rename from target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch
rename to target/linux/ar71xx/patches-3.18/404-mtd-cybertan-trx-parser.patch
index b5f4b529aff5d40b0b19b7d319bb622236f18b85..7995abbb458769d92e9a40d65d663a4fca7a4469 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-3.18/404-mtd-cybertan-trx-parser.patch
@@ -4,11 +4,11 @@
          This provides partitions parser for devices based on BCM47xx
          boards.
  
-+config MTD_WRT160NL_PARTS
-+      tristate "Linksys WRT160NL partitioning support"
-+      depends on ATH79_MACH_WRT160NL
++config MTD_CYBERTAN_PARTS
++      tristate "Cybertan partitioning support"
++      depends on ATH79
 +      ---help---
-+         Linksys WRT160NL partitioning support
++         Cybertan partitioning support
 +
  config MTD_MYLOADER_PARTS
        tristate "MyLoader partition parsing"
@@ -19,7 +19,7 @@
  obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
  obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
  obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
-+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
++obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o
  
  # 'Users' - code which presents functionality to userspace.
  obj-$(CONFIG_MTD_BLKDEVS)     += mtd_blkdevs.o

diff --git a/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch
index 74e79ea7706c0f5b0b8d7f20bd913e0a72d1065f..11a9beb19ed16dc2cfb8f0f2c46d014f653e82b0 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch
+++ b/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch
@@ -20,6 +20,6 @@
  obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
  obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
 +obj-$(CONFIG_MTD_TPLINK_PARTS)        += tplinkpart.o
- obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
+ obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o
  
  # 'Users' - code which presents functionality to userspace.