ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-27 17:18:59 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
d6939baac2
openwrt/target/linux/generic/pending-4.4/001-mtdsplit_backport.patch

154 lines
5.0 KiB
Diff
Raw Normal View History

kernel: update mtdsplit for linux 4.9 add backport patches for older kernels Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-02-01 07:06:10 +00:00
--- a/drivers/mtd/mtdsplit/mtdsplit_brnimage.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_brnimage.c
@@ -27,7 +27,7 @@
#define BRNIMAGE_MAX_OVERHEAD (BRNIMAGE_ALIGN_BYTES + BRNIMAGE_FOOTER_SIZE)
static int mtdsplit_parse_brnimage(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct mtd_partition *parts;
--- a/drivers/mtd/mtdsplit/mtdsplit_eva.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_eva.c
@@ -29,7 +29,7 @@ struct eva_image_header {
};
static int mtdsplit_parse_eva(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct mtd_partition *parts;
--- a/drivers/mtd/mtdsplit/mtdsplit_fit.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_fit.c
@@ -45,8 +45,7 @@ struct fdt_header {
};
static int
-mtdsplit_fit_parse(struct mtd_info *mtd,
- const struct mtd_partition **pparts,
+mtdsplit_fit_parse(struct mtd_info *mtd, struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct fdt_header hdr;
--- a/drivers/mtd/mtdsplit/mtdsplit_lzma.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_lzma.c
@@ -28,7 +28,7 @@ struct lzma_header {
};
static int mtdsplit_parse_lzma(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct lzma_header hdr;
--- a/drivers/mtd/mtdsplit/mtdsplit_seama.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_seama.c
@@ -30,7 +30,7 @@ struct seama_header {
};
static int mtdsplit_parse_seama(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct seama_header hdr;
--- a/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
@@ -23,7 +23,7 @@
static int
mtdsplit_parse_squashfs(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct mtd_partition *part;
--- a/drivers/mtd/mtdsplit/mtdsplit_tplink.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_tplink.c
@@ -83,8 +83,8 @@ struct tplink_fw_header {
};
static int mtdsplit_parse_tplink(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
{
struct tplink_fw_header hdr;
size_t hdr_len, retlen, kernel_size;
--- a/drivers/mtd/mtdsplit/mtdsplit_trx.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_trx.c
@@ -56,7 +56,7 @@ read_trx_header(struct mtd_info *mtd, si
static int
mtdsplit_parse_trx(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct mtd_partition *parts;
--- a/drivers/mtd/mtdsplit/mtdsplit_uimage.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_uimage.c
@@ -81,7 +81,7 @@ read_uimage_header(struct mtd_info *mtd,
* of a valid uImage header if found
*/
static int __mtdsplit_parse_uimage(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data,
ssize_t (*find_header)(u_char *buf, size_t len))
{
@@ -232,7 +232,7 @@ static ssize_t uimage_verify_default(u_c
static int
mtdsplit_uimage_parse_generic(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
return __mtdsplit_parse_uimage(master, pparts, data,
@@ -289,7 +289,7 @@ static ssize_t uimage_verify_wndr3700(u_
static int
mtdsplit_uimage_parse_netgear(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
return __mtdsplit_parse_uimage(master, pparts, data,
@@ -331,7 +331,7 @@ static ssize_t uimage_find_edimax(u_char
static int
mtdsplit_uimage_parse_edimax(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
return __mtdsplit_parse_uimage(master, pparts, data,
--- a/drivers/mtd/mtdsplit/mtdsplit_wrgg.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_wrgg.c
kernel: bump 4.4 to 4.4.119 This bumps the 4.4. kernel in master to 4.4.119. Includes more Meltdown & Spectre mitigation. * Refresh patches. * Refresh x86/config for RETPOLINE. * Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream) * Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream) * Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was replaced)). Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant. Compile-tested on: ar71xx & oxnas. Signed-off-by: Stijn Segers <foss@volatilesystems.org> Tested-by: Rosen Penev <rosenp@gmail.com>
2018-03-02 07:31:03 +00:00
@@ -51,8 +51,8 @@ struct wrg_header {
kernel: update mtdsplit for linux 4.9 add backport patches for older kernels Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-02-01 07:06:10 +00:00
static int mtdsplit_parse_wrgg(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
{
struct wrgg03_header hdr;
size_t hdr_len, retlen, kernel_ent_size;
kernel: fix compiler warning in mtdsplit_minor.c under 4.4 When mtdsplit_minor.c is compiled under Linux 4.4, the compiler drops the following warning: CC drivers/mtd/mtdsplit/mtdsplit_minor.o drivers/mtd/mtdsplit/mtdsplit_minor.c:106:14: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .parse_fn = mtdsplit_parse_minor, ^ drivers/mtd/mtdsplit/mtdsplit_minor.c:106:14: note: (near initialization for 'mtdsplit_minor_parser.parse_fn') The second parameter of the parser function must not have a 'const' qualifier in 4.4. The 001-mtdsplit_backport.patch removes the qualifier from other partition parsers. Update it to handle mtdsplit_minor.c as well. Signed-off-by: Gabor Juhos <juhosg@freemail.hu>
2017-12-13 20:56:03 +00:00
--- a/drivers/mtd/mtdsplit/mtdsplit_minor.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_minor.c
@@ -49,7 +49,7 @@ struct minor_header {
};
static int mtdsplit_parse_minor(struct mtd_info *master,
- const struct mtd_partition **pparts,
+ struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
struct minor_header hdr;
Reference in New Issue Copy Permalink