diff for duplicates of <20150121045407.7648.88225.sendpatchset@little-apple> diff --git a/a/1.txt b/N1/1.txt index 6306d0a..59e81a3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,7 +64,8 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> +++ work/arch/arm/boot/compressed/Makefile 2015-01-21 11:17:45.637573661 +0900 @@ -6,21 +6,6 @@ - OBJS + OBJS = + -# Ensure that MMCIF loader code appears early in the image -# to minimise that number of bocks that have to be read in -# order to load it. @@ -165,7 +166,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - * - * Use the following line to write the vrl4 formated zImage - * to an MMC card -- * # dd if=vrl4.out of=/dev/sdx bsQ2 seek=1 +- * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1 - */ -asmlinkage void mmc_loader(unsigned char *buf, unsigned long len) -{ @@ -204,7 +205,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - mmc_update_progress(MMC_PROGRESS_LOAD); - - /* load kernel via MMCIF interface */ -- sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */ +- sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is@block 2 */ - (len + SH_MMCIF_BBS - 1) / SH_MMCIF_BBS, buf); - - @@ -263,7 +264,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - * - * Use the following line to write the vrl4 formated zImage - * to an SD card -- * # dd if=vrl4.out of=/dev/sdx bsQ2 +- * # dd if=vrl4.out of=/dev/sdx bs=512 - */ -asmlinkage void mmc_loader(unsigned short *buf, unsigned long len) -{ @@ -298,7 +299,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - mmc_update_progress(MMC_PROGRESS_LOAD); - /* load kernel */ - if (sdhi_boot_do_read(SDHI_BASE, high_capacity, -- 0, /* Kernel is at block 1 */ +- 0, /* Kernel is@block 1 */ - (len + TMIO_BBS - 1) / TMIO_BBS, buf)) - goto err; - @@ -453,7 +454,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> -/* Set MMC clock / power. - * Note: This controller uses a simple divider scheme therefore it cannot - * run a MMC card at full speed (20MHz). The max clock is 24MHz on SD, but as -- * MMC wont run that fast, it has to be clocked at 12MHz which is the next +- * MMC wont run that fast, it has to be clocked@12MHz which is the next - * slowest setting. - */ -static int sdhi_boot_mmc_set_ios(void __iomem *base, struct mmc_ios *ios) @@ -638,7 +639,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - cmd.arg = (VOLTAGES != 0) << 8 | 0xaa; - cmd.flags = MMC_RSP_R1; - err = sdhi_boot_request(base, &cmd); /* Ignore error */ -- if ((cmd.resp[0] & 0xff) = 0xaa) +- if ((cmd.resp[0] & 0xff) == 0xaa) - sd_v2 = true; - } - @@ -673,7 +674,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - if (!err && timeout) { - if (!sd_v2) - sd_v1_0 = true; -- high_capacity = (cmd.resp[0] & OCR_HCS) = OCR_HCS; +- high_capacity = (cmd.resp[0] & OCR_HCS) == OCR_HCS; - } - } - @@ -696,7 +697,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - if (!timeout) - return -EAGAIN; - -- high_capacity = (cmd.resp[0] & OCR_HCS) = OCR_HCS; +- high_capacity = (cmd.resp[0] & OCR_HCS) == OCR_HCS; - } - - /* CMD2 - Get CID */ diff --git a/a/content_digest b/N1/content_digest index 5dbe790..357f23f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150121045256.7648.7451.sendpatchset@little-apple\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 07/13] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support\0" - "Date\0Wed, 21 Jan 2015 04:54:07 +0000\0" + "Date\0Wed, 21 Jan 2015 13:54:07 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -71,7 +71,8 @@ "+++ work/arch/arm/boot/compressed/Makefile\t2015-01-21 11:17:45.637573661 +0900\n" "@@ -6,21 +6,6 @@\n" " \n" - " OBJS\t\t \n" + " OBJS\t\t=\n" + " \n" "-# Ensure that MMCIF loader code appears early in the image\n" "-# to minimise that number of bocks that have to be read in\n" "-# order to load it.\n" @@ -172,7 +173,7 @@ "- *\n" "- * Use the following line to write the vrl4 formated zImage\n" "- * to an MMC card\n" - "- * # dd if=vrl4.out of=/dev/sdx bsQ2 seek=1\n" + "- * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1\n" "- */\n" "-asmlinkage void mmc_loader(unsigned char *buf, unsigned long len)\n" "-{\n" @@ -211,7 +212,7 @@ "-\tmmc_update_progress(MMC_PROGRESS_LOAD);\n" "-\n" "-\t/* load kernel via MMCIF interface */\n" - "-\tsh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */\n" + "-\tsh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is@block 2 */\n" "-\t\t\t (len + SH_MMCIF_BBS - 1) / SH_MMCIF_BBS, buf);\n" "-\n" "-\n" @@ -270,7 +271,7 @@ "- *\n" "- * Use the following line to write the vrl4 formated zImage\n" "- * to an SD card\n" - "- * # dd if=vrl4.out of=/dev/sdx bsQ2\n" + "- * # dd if=vrl4.out of=/dev/sdx bs=512\n" "- */\n" "-asmlinkage void mmc_loader(unsigned short *buf, unsigned long len)\n" "-{\n" @@ -305,7 +306,7 @@ "-\tmmc_update_progress(MMC_PROGRESS_LOAD);\n" "-\t/* load kernel */\n" "-\tif (sdhi_boot_do_read(SDHI_BASE, high_capacity,\n" - "-\t\t\t 0, /* Kernel is at block 1 */\n" + "-\t\t\t 0, /* Kernel is@block 1 */\n" "-\t\t\t (len + TMIO_BBS - 1) / TMIO_BBS, buf))\n" "-\t\tgoto err;\n" "-\n" @@ -460,7 +461,7 @@ "-/* Set MMC clock / power.\n" "- * Note: This controller uses a simple divider scheme therefore it cannot\n" "- * run a MMC card at full speed (20MHz). The max clock is 24MHz on SD, but as\n" - "- * MMC wont run that fast, it has to be clocked at 12MHz which is the next\n" + "- * MMC wont run that fast, it has to be clocked@12MHz which is the next\n" "- * slowest setting.\n" "- */\n" "-static int sdhi_boot_mmc_set_ios(void __iomem *base, struct mmc_ios *ios)\n" @@ -645,7 +646,7 @@ "-\t\tcmd.arg = (VOLTAGES != 0) << 8 | 0xaa;\n" "-\t\tcmd.flags = MMC_RSP_R1;\n" "-\t\terr = sdhi_boot_request(base, &cmd); /* Ignore error */\n" - "-\t\tif ((cmd.resp[0] & 0xff) = 0xaa)\n" + "-\t\tif ((cmd.resp[0] & 0xff) == 0xaa)\n" "-\t\t\tsd_v2 = true;\n" "-\t}\n" "-\n" @@ -680,7 +681,7 @@ "-\t\tif (!err && timeout) {\n" "-\t\t\tif (!sd_v2)\n" "-\t\t\t\tsd_v1_0 = true;\n" - "-\t\t\thigh_capacity = (cmd.resp[0] & OCR_HCS) = OCR_HCS;\n" + "-\t\t\thigh_capacity = (cmd.resp[0] & OCR_HCS) == OCR_HCS;\n" "-\t\t}\n" "-\t}\n" "-\n" @@ -703,7 +704,7 @@ "-\t\tif (!timeout)\n" "-\t\t\treturn -EAGAIN;\n" "-\n" - "-\t\thigh_capacity = (cmd.resp[0] & OCR_HCS) = OCR_HCS;\n" + "-\t\thigh_capacity = (cmd.resp[0] & OCR_HCS) == OCR_HCS;\n" "-\t}\n" "-\n" "-\t/* CMD2 - Get CID */\n" @@ -842,4 +843,4 @@ "-\n" -#endif /* SDHI_H */ -39f0e42cc09ef21cbb63bc2a08aa4b44749eebb839fd521db8cb50724f615a66 +17e6b0e135e8d4dc93cc3bdc5b7e3da89e5b8012777782021dfdab7612881340
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.