mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

kernel: mtdsplit_uimage: replace "allnet, uimage" parser 

Convert users to the generic "openwrt,uimage" using device specific
"openwrt,ih-magic" properties, and remove "allnet,uimage".

Signed-off-by: Bjørn Mork <bjorn@mork.no>
This commit is contained in:
Bjørn Mork 2021-01-20 18:36:49 +01:00 committed by Petr Štetiar
parent 01a1e21863
commit 647fdafcc5
2 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
View File

@ -333,54 +333,6 @@ static struct mtd_part_parser uimage_netgear_parser = {
};
/**************************************************
* ALLNET
**************************************************/
#define FW_MAGIC_SG8208M 0x00000006
#define FW_MAGIC_SG8310PM 0x83000006
static ssize_t uimage_verify_allnet(u_char *buf, size_t len, u32 ih_magic)
{
struct uimage_header *header = (struct uimage_header *)buf;
switch (be32_to_cpu(header->ih_magic)) {
case FW_MAGIC_SG8208M:
case FW_MAGIC_SG8310PM:
break;
default:
return -EINVAL;
}
if (header->ih_os != IH_OS_LINUX)
return -EINVAL;
return 0;
}
static int
mtdsplit_uimage_parse_allnet(struct mtd_info *master,
const struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
return __mtdsplit_parse_uimage(master, pparts, data,
uimage_verify_allnet);
}
static const struct of_device_id mtdsplit_uimage_allnet_of_match_table[] = {
{ .compatible = "allnet,uimage" },
{},
};
static struct mtd_part_parser uimage_allnet_parser = {
.owner = THIS_MODULE,
.name = "allnet-fw",
.of_match_table = mtdsplit_uimage_allnet_of_match_table,
.parse_fn = mtdsplit_uimage_parse_allnet,
};
/**************************************************
* Edimax
**************************************************/
@ -438,7 +390,6 @@ static int __init mtdsplit_uimage_init(void)
{
register_mtd_parser(&uimage_generic_parser);
register_mtd_parser(&uimage_netgear_parser);
register_mtd_parser(&uimage_allnet_parser);
register_mtd_parser(&uimage_edimax_parser);
return 0;

3
target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
View File

@ -95,7 +95,8 @@
partition@2a0000 {
label = "firmware";
reg = <0x2a0000 0xd60000>;
compatible = "allnet,uimage";
compatible = "openwrt,uimage", "denx,uimage";
openwrt,ih-magic = <0x00000006>;
};
};
};