treewide: Run refresh on all packages

The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>

6 files changed, 47 insertions, 81 deletions

diff --git a/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch b/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch
index 1e9e295ac..36ea88ccb 100644
--- a/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch
+++ b/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch
@@ -11,11 +11,9 @@ Acked-by: Avri Altman <avri.altman@wdc.com>
  lsmmc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/lsmmc.c b/lsmmc.c
-index 4f687ac..b627b79 100644
 --- a/lsmmc.c
 +++ b/lsmmc.c
-@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config, char *cid)
+@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config
  	unsigned int crc;
  
  	parse_bin(cid, "8u6r2u8u48a4u4u32u4u4u7u1r",
@@ -24,6 +22,3 @@ index 4f687ac..b627b79 100644
  		&mdt_year, &mdt_month, &crc);
  
  	pnm[6] = '\0';
--- 
-2.17.1
-
diff --git a/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch b/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch
index ba97e79f6..6ccf2e5ba 100644
--- a/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch
+++ b/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch
@@ -12,8 +12,6 @@ Signed-off-by: Stephane Fillod <f8cfe@free.fr>
  lsmmc.c | 34 ++++++++++++++++++++++++++++++++--
  1 file changed, 32 insertions(+), 2 deletions(-)
 
-diff --git a/lsmmc.c b/lsmmc.c
-index b627b79..63504d2 100644
 --- a/lsmmc.c
 +++ b/lsmmc.c
 @@ -112,7 +112,7 @@ struct ids_database database[] = {
@@ -34,36 +32,34 @@ index b627b79..63504d2 100644
  	},
  	{
  		.type = "sd",
-@@ -134,6 +134,11 @@ struct ids_database database[] = {
- 		.id = 0x1f,
- 		.manufacturer = "Kingston",
+@@ -136,6 +136,11 @@ struct ids_database database[] = {
  	},
-+	{
-+		.type = "sd",
+ 	{
+ 		.type = "sd",
 +		.id = 0x27,
 +		.manufacturer = "Delkin/Phison",
 +	},
- 	{
- 		.type = "sd",
- 		.id = 0x28,
-@@ -144,6 +149,11 @@ struct ids_database database[] = {
- 		.id = 0x30,
- 		.manufacturer = "SanDisk",
- 	},
 +	{
 +		.type = "sd",
+ 		.id = 0x28,
+ 		.manufacturer = "Lexar",
+ 	},
+@@ -146,6 +151,11 @@ struct ids_database database[] = {
+ 	},
+ 	{
+ 		.type = "sd",
 +		.id = 0x31,
 +		.manufacturer = "Silicon Power",
 +	},
- 	{
- 		.type = "sd",
++	{
++		.type = "sd",
  		.id = 0x33,
-@@ -159,6 +169,21 @@ struct ids_database database[] = {
- 		.id = 0x6f,
  		.manufacturer = "STMicroelectronics",
  	},
-+	{
-+		.type = "sd",
+@@ -161,6 +171,21 @@ struct ids_database database[] = {
+ 	},
+ 	{
+ 		.type = "sd",
 +		.id = 0x74,
 +		.manufacturer = "Transcend",
 +	},
@@ -77,9 +73,11 @@ index b627b79..63504d2 100644
 +		.id = 0x82,
 +		.manufacturer = "Gobe/Sony",
 +	},
- 	{
- 		.type = "sd",
++	{
++		.type = "sd",
  		.id = 0x89,
+ 		.manufacturer = "Unknown",
+ 	},
 @@ -224,6 +249,11 @@ struct ids_database database[] = {
  		.id = 0x70,
  		.manufacturer = "Kingston",
@@ -92,6 +90,3 @@ index b627b79..63504d2 100644
  };
  
  /* Command line parsing functions */
--- 
-2.17.1
-
diff --git a/utils/mmc-utils/patches/0008-Various-fixes.patch b/utils/mmc-utils/patches/0008-Various-fixes.patch
index f680350f8..f3ea6a73d 100644
--- a/utils/mmc-utils/patches/0008-Various-fixes.patch
+++ b/utils/mmc-utils/patches/0008-Various-fixes.patch
@@ -12,11 +12,9 @@ Reviewed-by: Michael Heimpold <mhei@heimpold.de>
  mmc_cmds.c | 14 ++++++++++++--
  2 files changed, 33 insertions(+), 23 deletions(-)
 
-diff --git a/lsmmc.c b/lsmmc.c
-index 63504d2..06cc0b8 100644
 --- a/lsmmc.c
 +++ b/lsmmc.c
-@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config, char *cid)
+@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config,
  		printf("\tOID: %s\n", oid);
  		printf("\tPNM: %s\n", pnm);
  		printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor);
@@ -28,7 +26,7 @@ index 63504d2..06cc0b8 100644
  		       2000 + mdt_year, months[mdt_month]);
  		printf("\tCRC: 0x%02x\n", crc);
  	} else {
-@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config, char *cid)
+@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config,
  		else
  			printf("manufacturer: 'Unlisted' '%s'\n", oid);
  
@@ -40,7 +38,7 @@ index 63504d2..06cc0b8 100644
  		       months[mdt_month]);
  	}
  }
-@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config, char *cid)
+@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config
  		printf("\tOID: 0x%01x\n", oid);
  		printf("\tPNM: %s\n", pnm);
  		printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor);
@@ -52,7 +50,7 @@ index 63504d2..06cc0b8 100644
  		       1997 + mdt_year, months[mdt_month]);
  		printf("\tCRC: 0x%02x\n", crc);
  	} else {
-@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config, char *cid)
+@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config
  		else
  			printf("manufacturer: 'Unlisted' '%c'\n", oid);
  
@@ -64,7 +62,7 @@ index 63504d2..06cc0b8 100644
  		       months[mdt_month]);
  	}
  }
-@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config, char *csd)
+@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config,
  
  		printf("======SD/CSD======\n");
  
@@ -73,7 +71,7 @@ index 63504d2..06cc0b8 100644
  		printf("\tTAAC: 0x%02x (", taac);
  
  		switch (taac_timevalue) {
-@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config, char *csd)
+@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config,
  		if (csd_structure == 1 && taac != 0x0e)
  			printf("Warn: Invalid TAAC (should be 0x0e)\n");
  
@@ -82,7 +80,7 @@ index 63504d2..06cc0b8 100644
  		if (csd_structure == 1 && nsac != 0x00)
  			printf("Warn: Invalid NSAC (should be 0x00)\n");
  
-@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config, char *csd)
+@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config,
  			if (erase_blk_en != 0x01)
  				printf("Warn: Invalid ERASE_BLK_EN (should be 0x01)\n");
  
@@ -97,7 +95,7 @@ index 63504d2..06cc0b8 100644
  			       wp_grp_size, wp_grp_size + 1);
  			if (wp_grp_size != 0x00)
  				printf("Warn: Invalid WP_GRP_SIZE (should be 0x00)\n");
-@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config, char *csd)
+@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config,
  			if (wp_grp_enable != 0x00)
  				printf("Warn: Invalid WP_GRP_ENABLE (should be 0x00)\n");
  
@@ -106,7 +104,7 @@ index 63504d2..06cc0b8 100644
  			       r2w_factor, r2w_factor);
  			if (r2w_factor != 0x02)
  				printf("Warn: Invalid R2W_FACTOR (should be 0x02)\n");
-@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config, char *csd)
+@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config,
  		else
  			printf("%.2fbyte", memory_capacity * 1.0);
  
@@ -115,7 +113,7 @@ index 63504d2..06cc0b8 100644
  		       memory_capacity, blocks, block_size);
  	} else {
  		unsigned long long blocks = 0;
-@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config, char *csd)
+@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config,
  		else
  			printf("%.2fbyte", memory_capacity * 1.0);
  
@@ -124,7 +122,7 @@ index 63504d2..06cc0b8 100644
  		       memory_capacity, blocks, block_size);
  	}
  }
-@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config, char *csd)
+@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config
  			break;
  		}
  
@@ -133,7 +131,7 @@ index 63504d2..06cc0b8 100644
  		printf("\tTRAN_SPEED: 0x%02x (", tran_speed);
  		switch (tran_speed_timevalue) {
  		case 0x0:
-@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config, char *csd)
+@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config
  
  		printf("\tC_SIZE_MULT: 0x%01x\n", c_size_mult);
  		printf("\tERASE_GRP_SIZE: 0x%02x\n", erase_grp_size);
@@ -146,7 +144,7 @@ index 63504d2..06cc0b8 100644
  		       wp_grp_size, wp_grp_size + 1);
  		printf("\tWP_GRP_ENABLE: 0x%01x\n", wp_grp_enable);
  
-@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config, char *csd)
+@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config
  			break;
  		}
  
@@ -155,7 +153,7 @@ index 63504d2..06cc0b8 100644
  		       r2w_factor, r2w_factor);
  
  		printf("\tWRITE_BL_LEN: 0x%01x (", write_bl_len);
-@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config, char *csd)
+@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config
  		else
  			printf("%.2fbyte", memory_capacity * 1.0);
  
@@ -164,7 +162,7 @@ index 63504d2..06cc0b8 100644
  		       memory_capacity, blocks, block_size);
  	} else {
  		int mult;
-@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config, char *csd)
+@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config
  			printf("%.2fKbyte", memory_capacity / (1024.0));
  		else
  			printf("%.2fbyte", memory_capacity * 1.0);
@@ -173,11 +171,9 @@ index 63504d2..06cc0b8 100644
  		       memory_capacity, blocks, block_size);
  	}
  }
-diff --git a/mmc_cmds.c b/mmc_cmds.c
-index fb37189..8f4a476 100644
 --- a/mmc_cmds.c
 +++ b/mmc_cmds.c
-@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs, char **argv)
+@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs,
  
  	print_writeprotect_boot_status(ext_csd);
  
@@ -185,7 +181,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs, char **argv)
+@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs,
  		exit(1);
  	}
  
@@ -193,7 +189,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs, char **argv)
+@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs,
  	if (last_wpblk != (x + y - 1))
  		print_wp_status(wp_sizeblks, last_wpblk, cnt - 1, last_prot);
  
@@ -201,7 +197,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs, char **argv)
+@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs,
  		printf("MMC does not support disabling 512B emulation mode.\n");
  	}
  
@@ -209,7 +205,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **argv)
+@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **a
  			value, EXT_CSD_PART_CONFIG, device);
  		exit(1);
  	}
@@ -217,7 +213,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, char **argv)
+@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, cha
  		exit(1);
  	}
  
@@ -225,7 +221,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char **argv)
+@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char **
  		exit(1);
  	}
  
@@ -233,7 +229,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv)
+@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv
  
  	printf("SEND_STATUS response: 0x%08x\n", response);
  
@@ -241,7 +237,7 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
-@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **argv)
+@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **arg
  		printf("Write reliability setting register"
  			" [WR_REL_SET]: 0x%02x\n", reg);
  
@@ -263,7 +259,7 @@ index fb37189..8f4a476 100644
  	return ret;
  
  }
-@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs, char **argv)
+@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs,
  		exit(1);
  	}
  
@@ -271,6 +267,3 @@ index fb37189..8f4a476 100644
  	return ret;
  }
  
--- 
-2.17.1
-
diff --git a/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch b/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch
index ca0e02af8..186e61313 100644
--- a/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch
+++ b/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch
@@ -14,8 +14,6 @@ Reviewed-by: Avri Altman <avri.altman@wdc.com>
  mmc_cmds.c | 70 ++++++++++++++++++++++++++++++------------------------
  2 files changed, 41 insertions(+), 31 deletions(-)
 
-diff --git a/mmc.h b/mmc.h
-index 648fb26..d648f68 100644
 --- a/mmc.h
 +++ b/mmc.h
 @@ -25,10 +25,12 @@
@@ -31,8 +29,6 @@ index 648fb26..d648f68 100644
  #define MMC_WRITE_BLOCK		24	/* adtc [31:0] data addr	R1  */
  #define MMC_WRITE_MULTIPLE_BLOCK 25   /* adtc                    R1  */
  #define MMC_SET_WRITE_PROT	28    /* ac   [31:0] data addr   R1b */
-diff --git a/mmc_cmds.c b/mmc_cmds.c
-index 8f4a476..c006ef2 100644
 --- a/mmc_cmds.c
 +++ b/mmc_cmds.c
 @@ -2456,12 +2456,13 @@ int do_ffu(int nargs, char **argv)
@@ -183,6 +179,3 @@ index 8f4a476..c006ef2 100644
  			goto out;
  		}
  
--- 
-2.17.1
-
diff --git a/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch b/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch
index 64d275cda..185d64e47 100644
--- a/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch
+++ b/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch
@@ -13,8 +13,6 @@ Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
  lsmmc.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/lsmmc.c b/lsmmc.c
-index 06cc0b8..05d59e8 100644
 --- a/lsmmc.c
 +++ b/lsmmc.c
 @@ -393,10 +393,9 @@ char *read_file(char *name)
@@ -30,6 +28,3 @@ index 06cc0b8..05d59e8 100644
  }
  
  /* Hexadecimal string parsing functions */
--- 
-2.17.1
-
diff --git a/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch b/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch
index 591056413..ec0c4d903 100644
--- a/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch
+++ b/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch
@@ -14,11 +14,9 @@ Reviewed-by: Avri Altman <avri.altman@wdc.com>
  mmc_cmds.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/mmc_cmds.c b/mmc_cmds.c
-index c006ef2..556c105 100644
 --- a/mmc_cmds.c
 +++ b/mmc_cmds.c
-@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **argv)
+@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **arg
  		printf("Power off notification [POWER_OFF_LONG_TIME: 0x%02x]\n",
  			ext_csd[247]);
  		printf("Cache Size [CACHE_SIZE] is %d KiB\n",
@@ -29,6 +27,3 @@ index c006ef2..556c105 100644
  	}
  
  	/* A441: Reserved [501:247]
--- 
-2.17.1
-