ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-25 21:59:32 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

kernel: move parser_trx patches of custom magic to generic

Browse Source 
This patch moves the patches of parser_trx in mediatek target to
generic/backport-5.10 to use the changes from ramips target and
backport the additional patch of the parser.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
This commit is contained in:
INAGAKI Hiroshi 2022-02-12 13:09:23 +09:00 committed by Hauke Mehrtens
parent 770cfe9bff
commit cc49abc06b
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
target/linux/mediatek/patches-5.10/350-dt-bindings-mtd-brcm-trx-Add-brcm-trx-magic.patch → target/linux/generic/backport-5.10/409-v5.14-0001-dt-bindings-mtd-brcm-trx-Add-brcm-trx-magic.patch
View File

4
target/linux/mediatek/patches-5.10/351-mtd-parsers-trx-Allow-to-specify-brcm-trx-magic-in-D.patch → target/linux/generic/backport-5.10/409-v5.14-0002-mtd-parsers-trx-Allow-to-specify-brcm-trx-magic-in-D.patch
View File

@ -18,7 +18,7 @@ Link: https://lore.kernel.org/linux-mtd/20210418214616.239574-3-hauke@hauke-m.de
--- a/drivers/mtd/parsers/parser_trx.c --- a/drivers/mtd/parsers/parser_trx.c
+++ b/drivers/mtd/parsers/parser_trx.c +++ b/drivers/mtd/parsers/parser_trx.c
@@ -78,13 +78,20 @@ static int parser_trx_parse(struct mtd_i @@ -51,13 +51,20 @@ static int parser_trx_parse(struct mtd_i
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
{ {
@ -39,7 +39,7 @@ Link: https://lore.kernel.org/linux-mtd/20210418214616.239574-3-hauke@hauke-m.de
parts = kcalloc(TRX_PARSER_MAX_PARTS, sizeof(struct mtd_partition), parts = kcalloc(TRX_PARSER_MAX_PARTS, sizeof(struct mtd_partition),
GFP_KERNEL); GFP_KERNEL);
if (!parts) if (!parts)
@@ -97,7 +104,7 @@ static int parser_trx_parse(struct mtd_i @@ -70,7 +77,7 @@ static int parser_trx_parse(struct mtd_i
return err; return err;
} }

2
target/linux/mediatek/patches-5.10/352-mtd-parsers-trx-Allow-to-use-TRX-parser-on-Mediatek-.patch → target/linux/generic/backport-5.10/409-v5.14-0003-mtd-parsers-trx-Allow-to-use-TRX-parser-on-Mediatek-.patch
View File

@ -14,7 +14,7 @@ Link: https://lore.kernel.org/linux-mtd/20210418214616.239574-4-hauke@hauke-m.de
--- a/drivers/mtd/parsers/Kconfig --- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig
@@ -131,7 +131,7 @@ config MTD_AFS_PARTS @@ -115,7 +115,7 @@ config MTD_AFS_PARTS
config MTD_PARSER_TRX config MTD_PARSER_TRX
tristate "Parser for TRX format partitions" tristate "Parser for TRX format partitions"

1
target/linux/generic/config-5.10
View File

@ -3624,6 +3624,7 @@ CONFIG_MTD_OF_PARTS=y
# CONFIG_MTD_ONENAND is not set # CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OOPS is not set # CONFIG_MTD_OOPS is not set
# CONFIG_MTD_OTP is not set # CONFIG_MTD_OTP is not set
# CONFIG_MTD_PARSER_TRX is not set
# CONFIG_MTD_PARTITIONED_MASTER is not set # CONFIG_MTD_PARTITIONED_MASTER is not set
# CONFIG_MTD_PCI is not set # CONFIG_MTD_PCI is not set
# CONFIG_MTD_PCMCIA is not set # CONFIG_MTD_PCMCIA is not set

2
target/linux/generic/pending-5.10/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
View File

@ -40,7 +40,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
static const char *parser_trx_data_part_name(struct mtd_info *master, static const char *parser_trx_data_part_name(struct mtd_info *master,
size_t offset) size_t offset)
{ {
@@ -79,21 +106,21 @@ static int parser_trx_parse(struct mtd_i @@ -86,21 +113,21 @@ static int parser_trx_parse(struct mtd_i
if (trx.offset[2]) { if (trx.offset[2]) {
part = &parts[curr_part++]; part = &parts[curr_part++];
part->name = "loader"; part->name = "loader";