hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44663 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2015-03-11 15:56:15 +00:00
parent d93222ddef
commit 2eabbd5247
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/config-3.14
View File

@ -254,7 +254,7 @@ CONFIG_MTD_SPLIT_LZMA_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_MTD_TPLINK_PARTS=y CONFIG_MTD_TPLINK_PARTS=y
CONFIG_MTD_WRT160NL_PARTS=y CONFIG_MTD_CYBERTAN_PARTS=y
CONFIG_MYLOADER=y CONFIG_MYLOADER=y
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y

2
target/linux/ar71xx/config-3.18
View File

@ -257,7 +257,7 @@ CONFIG_MTD_SPLIT_LZMA_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_MTD_TPLINK_PARTS=y CONFIG_MTD_TPLINK_PARTS=y
CONFIG_MTD_WRT160NL_PARTS=y CONFIG_MTD_CYBERTAN_PARTS=y
CONFIG_MYLOADER=y CONFIG_MYLOADER=y
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y

2
target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
View File

@ -34,7 +34,7 @@
#define WRT160NL_NVRAM_SIZE 0x10000 #define WRT160NL_NVRAM_SIZE 0x10000
static const char *wrt160nl_part_probes[] = { static const char *wrt160nl_part_probes[] = {
"wrt160nl", "cybertan",
NULL, NULL,
}; };

34
target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c → target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
View File

@ -61,7 +61,7 @@ struct uimage_header {
uint32_t ih_hcrc; /* Image Header CRC Checksum */ uint32_t ih_hcrc; /* Image Header CRC Checksum */
uint32_t ih_time; /* Image Creation Timestamp */ uint32_t ih_time; /* Image Creation Timestamp */
uint32_t ih_size; /* Image Data Size */ 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_ep; /* Entry Point Address */
uint32_t ih_dcrc; /* Image Data CRC Checksum */ uint32_t ih_dcrc; /* Image Data CRC Checksum */
uint8_t ih_os; /* Operating System */ uint8_t ih_os; /* Operating System */
@ -71,21 +71,21 @@ struct uimage_header {
uint8_t ih_name[IH_NMLEN]; /* Image Name */ uint8_t ih_name[IH_NMLEN]; /* Image Name */
}; };
struct wrt160nl_header { struct firmware_header {
struct cybertan_header cybertan; struct cybertan_header cybertan;
struct trx_header trx; struct trx_header trx;
struct uimage_header uimage; struct uimage_header uimage;
} __attribute__ ((packed)); } __packed;
#define WRT160NL_UBOOT_LEN 0x40000 #define UBOOT_LEN 0x40000
#define WRT160NL_ART_LEN 0x10000 #define ART_LEN 0x10000
#define WRT160NL_NVRAM_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_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
{ {
struct wrt160nl_header *header; struct firmware_header *header;
struct trx_header *theader; struct trx_header *theader;
struct uimage_header *uheader; struct uimage_header *uheader;
struct mtd_partition *trx_parts; struct mtd_partition *trx_parts;
@ -96,9 +96,9 @@ static int wrt160nl_parse_partitions(struct mtd_info *master,
unsigned int art_len; unsigned int art_len;
int ret; int ret;
uboot_len = max_t(unsigned int, master->erasesize, WRT160NL_UBOOT_LEN); uboot_len = max_t(unsigned int, master->erasesize, UBOOT_LEN);
nvram_len = max_t(unsigned int, master->erasesize, WRT160NL_NVRAM_LEN); nvram_len = max_t(unsigned int, master->erasesize, NVRAM_LEN);
art_len = max_t(unsigned int, master->erasesize, WRT160NL_ART_LEN); art_len = max_t(unsigned int, master->erasesize, ART_LEN);
trx_parts = kzalloc(TRX_PARTS * sizeof(struct mtd_partition), trx_parts = kzalloc(TRX_PARTS * sizeof(struct mtd_partition),
GFP_KERNEL); GFP_KERNEL);
@ -188,20 +188,20 @@ out:
return ret; return ret;
} }
static struct mtd_part_parser wrt160nl_parser = { static struct mtd_part_parser cybertan_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.parse_fn = wrt160nl_parse_partitions, .parse_fn = cybertan_parse_partitions,
.name = "wrt160nl", .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; return 0;
} }
module_init(wrt160nl_parser_init); module_init(cybertan_parser_init);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Christian Daniel <cd@maintech.de>"); MODULE_AUTHOR("Christian Daniel <cd@maintech.de>");

10
target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch → target/linux/ar71xx/patches-3.14/404-mtd-cybertan-trx-parser.patch
View File

@ -4,11 +4,11 @@
This provides partitions parser for devices based on BCM47xx This provides partitions parser for devices based on BCM47xx
boards. boards.
+config MTD_WRT160NL_PARTS +config MTD_CYBERTAN_PARTS
+ tristate "Linksys WRT160NL partitioning support" + tristate "Cybertan partitioning support"
+ depends on ATH79_MACH_WRT160NL + depends on ATH79
+ ---help--- + ---help---
+ Linksys WRT160NL partitioning support + Cybertan partitioning support
+ +
config MTD_MYLOADER_PARTS config MTD_MYLOADER_PARTS
tristate "MyLoader partition parsing" tristate "MyLoader partition parsing"
@ -19,7 +19,7 @@
obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.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. # 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o

2
target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
View File

@ -20,6 +20,6 @@
obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.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. # 'Users' - code which presents functionality to userspace.

10
target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch → target/linux/ar71xx/patches-3.18/404-mtd-cybertan-trx-parser.patch
View File

@ -4,11 +4,11 @@
This provides partitions parser for devices based on BCM47xx This provides partitions parser for devices based on BCM47xx
boards. boards.
+config MTD_WRT160NL_PARTS +config MTD_CYBERTAN_PARTS
+ tristate "Linksys WRT160NL partitioning support" + tristate "Cybertan partitioning support"
+ depends on ATH79_MACH_WRT160NL + depends on ATH79
+ ---help--- + ---help---
+ Linksys WRT160NL partitioning support + Cybertan partitioning support
+ +
config MTD_MYLOADER_PARTS config MTD_MYLOADER_PARTS
tristate "MyLoader partition parsing" tristate "MyLoader partition parsing"
@ -19,7 +19,7 @@
obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.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. # 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o

2
target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch
View File

@ -20,6 +20,6 @@
obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.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. # 'Users' - code which presents functionality to userspace.