diff for duplicates of <5592FE50.2080000@c-s.fr> diff --git a/a/1.txt b/N1/1.txt index 0e7c578..9f9cb3d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,23 +8,23 @@ firmware never gets included in my kernel, allthough I have set the below CONFIG items: # CONFIG_NO_UCODE_PATCH is not set -CONFIG_USB_SOF_UCODE_PATCH=3Dy +CONFIG_USB_SOF_UCODE_PATCH=y # CONFIG_I2C_SPI_UCODE_PATCH is not set # CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set -CONFIG_UCODE_PATCH=3Dy +CONFIG_UCODE_PATCH=y # # Generic Driver Options # # CONFIG_UEVENT_HELPER is not set -CONFIG_DEVTMPFS=3Dy -CONFIG_DEVTMPFS_MOUNT=3Dy +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=3Dy -CONFIG_FIRMWARE_IN_KERNEL=3Dy -CONFIG_EXTRA_FIRMWARE=3D"" -CONFIG_FW_LOADER_USER_HELPER=3Dy -CONFIG_FW_LOADER_USER_HELPER_FALLBACK=3Dy +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y Can anybody help in finding what's wrong there ? @@ -66,7 +66,7 @@ index 6727dc5..c24780c 100644 - -#ifdef CONFIG_I2C_SPI_UCODE_PATCH - --static uint patch_2000[] __initdata =3D { +-static uint patch_2000[] __initdata = { - 0x7FFFEFD9, - 0x3FFD0000, - 0x7FFB49F7, @@ -185,7 +185,7 @@ index 6727dc5..c24780c 100644 - 0x5F8247F8 -}; - --static uint patch_2f00[] __initdata =3D { +-static uint patch_2f00[] __initdata = { - 0x3E303430, - 0x34343737, - 0xABF7BF9B, @@ -227,7 +227,7 @@ index 6727dc5..c24780c 100644 +MODULE_FIRMWARE("freescale/i2c_spi_smc1.bin"); +MODULE_FIRMWARE("freescale/usb_sof.bin"); --static uint patch_2000[] __initdata =3D { +-static uint patch_2000[] __initdata = { - 0x3fff0000, - 0x3ffd0000, - 0x3ffb0000, @@ -550,7 +550,7 @@ index 6727dc5..c24780c 100644 - 0x6079e2bb -}; - --static uint patch_2f00[] __initdata =3D { +-static uint patch_2f00[] __initdata = { - 0x30303030, - 0x3e3e3434, - 0xabbf9b99, @@ -617,7 +617,7 @@ index 6727dc5..c24780c 100644 - 0xf22f3f23 -}; - --static uint patch_2e00[] __initdata =3D { +-static uint patch_2e00[] __initdata = { - 0x27eeeeee, - 0xeeeeeeee, - 0xeeeeeeee, @@ -651,10 +651,10 @@ index 6727dc5..c24780c 100644 + } -#ifdef CONFIG_USB_SOF_UCODE_PATCH -+ for (i =3D 0, src =3D (uint*)fw->data; i < fw->size >> 2; i++) -+ *dpmem++ =3D *src++; ++ for (i = 0, src = (uint*)fw->data; i < fw->size >> 2; i++) ++ *dpmem++ = *src++; --static uint patch_2000[] __initdata =3D { +-static uint patch_2000[] __initdata = { - 0x7fff0000, - 0x7ffd0000, - 0x7ffb0000, @@ -669,7 +669,7 @@ index 6727dc5..c24780c 100644 - 0x60750000 -}; - --static uint patch_2f00[] __initdata =3D { +-static uint patch_2f00[] __initdata = { - 0x3030304c, - 0xcab9e441, - 0xa1aaf220 @@ -693,24 +693,24 @@ index 6727dc5..c24780c 100644 #endif - int i; - commproc =3D cp; + commproc = cp; -#ifdef CONFIG_USB_SOF_UCODE_PATCH - commproc->cp_rccr =3D 0; + commproc->cp_rccr = 0; -- dp =3D (uint *)(commproc->cp_dpmem); -- for (i=3D0; i<(sizeof(patch_2000)/4); i++) -- *dp++ =3D patch_2000[i]; +- dp = (uint *)(commproc->cp_dpmem); +- for (i=0; i<(sizeof(patch_2000)/4); i++) +- *dp++ = patch_2000[i]; - -- dp =3D (uint *)&(commproc->cp_dpmem[0x0f00]); -- for (i=3D0; i<(sizeof(patch_2f00)/4); i++) -- *dp++ =3D patch_2f00[i]; +- dp = (uint *)&(commproc->cp_dpmem[0x0f00]); +- for (i=0; i<(sizeof(patch_2f00)/4); i++) +- *dp++ = patch_2f00[i]; +#ifdef CONFIG_USB_SOF_UCODE_PATCH + if (cpm_copy_firmware((unsigned char*)commproc->cp_dpmem, + "freescale/usb_sof.bin")) + return; - commproc->cp_rccr =3D 0x0009; + commproc->cp_rccr = 0x0009; printk("USB SOF microcode patch installed\n"); #endif /* CONFIG_USB_SOF_UCODE_PATCH */ @@ -722,52 +722,51 @@ index 6727dc5..c24780c 100644 + "freescale/i2c_spi.bin")) + return; -- commproc->cp_rccr =3D 0; +- commproc->cp_rccr = 0; +#endif +#ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH + if (cpm_copy_firmware((unsigned char*)commproc->cp_dpmem, + "freescale/i2c_spi_smc1.bin")) + return; -- dp =3D (uint *)(commproc->cp_dpmem); -- for (i=3D0; i<(sizeof(patch_2000)/4); i++) -- *dp++ =3D patch_2000[i]; +- dp = (uint *)(commproc->cp_dpmem); +- for (i=0; i<(sizeof(patch_2000)/4); i++) +- *dp++ = patch_2000[i]; +#endif -- dp =3D (uint *)&(commproc->cp_dpmem[0x0f00]); -- for (i=3D0; i<(sizeof(patch_2f00)/4); i++) -- *dp++ =3D patch_2f00[i]; +- dp = (uint *)&(commproc->cp_dpmem[0x0f00]); +- for (i=0; i<(sizeof(patch_2f00)/4); i++) +- *dp++ = patch_2f00[i]; +#if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \ + defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) - iip =3D (iic_t *)&commproc->cp_dparam[PROFF_IIC]; + iip = (iic_t *)&commproc->cp_dparam[PROFF_IIC]; # define RPBASE 0x0500 @@ -688,10 +107,6 @@ void __init cpm_load_patch(cpm8xx_t *cp) # if defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) -- dp =3D (uint *)&(commproc->cp_dpmem[0x0e00]); -- for (i=3D0; i<(sizeof(patch_2e00)/4); i++) -- *dp++ =3D patch_2e00[i]; +- dp = (uint *)&(commproc->cp_dpmem[0x0e00]); +- for (i=0; i<(sizeof(patch_2e00)/4); i++) +- *dp++ = patch_2e00[i]; - - commproc->cp_cpmcr1 =3D 0x8080; - commproc->cp_cpmcr2 =3D 0x808a; - commproc->cp_cpmcr3 =3D 0x8028; + commproc->cp_cpmcr1 = 0x8080; + commproc->cp_cpmcr2 = 0x808a; + commproc->cp_cpmcr3 = 0x8028; diff --git a/firmware/Makefile b/firmware/Makefile index e297e1b..1454d27 100644 --- a/firmware/Makefile +++ b/firmware/Makefile -@@ -135,6 +135,9 @@ fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) +=3D +@@ -135,6 +135,9 @@ fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw - fw-shipped-$(CONFIG_USB_VICAM) +=3D vicam/firmware.fw - fw-shipped-$(CONFIG_VIDEO_CPIA2) +=3D cpia2/stv0672_vp4.bin - fw-shipped-$(CONFIG_YAM) +=3D yam/1200.bin yam/9600.bin -+fw_shipped-$(CONFIG_USB_SOF_UCODE_PATCH) +=3D freescale/usb_sof.bin -+fw_shipped-$(CONFIG_I2C_SPI_UCODE_PATCH) +=3D freescale/i2c_spi.bin -+fw_shipped-$(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) +=3D freescale/i2c_spi_smc1.= -bin + fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw + fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin + fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin ++fw_shipped-$(CONFIG_USB_SOF_UCODE_PATCH) += freescale/usb_sof.bin ++fw_shipped-$(CONFIG_I2C_SPI_UCODE_PATCH) += freescale/i2c_spi.bin ++fw_shipped-$(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) += freescale/i2c_spi_smc1.bin - fw-shipped-all :=3D $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) + fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) diff --git a/firmware/freescale/i2c_spi.bin.ihex b/firmware/freescale/i2c_spi.bin.ihex @@ -1823,6 +1822,5 @@ index 0000000..69fb776 --- -L'absence de virus dans ce courrier =C3=A9lectronique a =C3=A9t=C3=A9 v=C3= -=A9rifi=C3=A9e par le logiciel antivirus Avast. +L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast. https://www.avast.com/antivirus diff --git a/a/content_digest b/N1/content_digest index 1252d04..b3293ff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -18,23 +18,23 @@ "below CONFIG items:\n" "\n" "# CONFIG_NO_UCODE_PATCH is not set\n" - "CONFIG_USB_SOF_UCODE_PATCH=3Dy\n" + "CONFIG_USB_SOF_UCODE_PATCH=y\n" "# CONFIG_I2C_SPI_UCODE_PATCH is not set\n" "# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set\n" - "CONFIG_UCODE_PATCH=3Dy\n" + "CONFIG_UCODE_PATCH=y\n" "#\n" "# Generic Driver Options\n" "#\n" "# CONFIG_UEVENT_HELPER is not set\n" - "CONFIG_DEVTMPFS=3Dy\n" - "CONFIG_DEVTMPFS_MOUNT=3Dy\n" + "CONFIG_DEVTMPFS=y\n" + "CONFIG_DEVTMPFS_MOUNT=y\n" "# CONFIG_STANDALONE is not set\n" "# CONFIG_PREVENT_FIRMWARE_BUILD is not set\n" - "CONFIG_FW_LOADER=3Dy\n" - "CONFIG_FIRMWARE_IN_KERNEL=3Dy\n" - "CONFIG_EXTRA_FIRMWARE=3D\"\"\n" - "CONFIG_FW_LOADER_USER_HELPER=3Dy\n" - "CONFIG_FW_LOADER_USER_HELPER_FALLBACK=3Dy\n" + "CONFIG_FW_LOADER=y\n" + "CONFIG_FIRMWARE_IN_KERNEL=y\n" + "CONFIG_EXTRA_FIRMWARE=\"\"\n" + "CONFIG_FW_LOADER_USER_HELPER=y\n" + "CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y\n" "\n" "Can anybody help in finding what's wrong there ?\n" "\n" @@ -76,7 +76,7 @@ "-\n" "-#ifdef CONFIG_I2C_SPI_UCODE_PATCH\n" "-\n" - "-static uint patch_2000[] __initdata =3D {\n" + "-static uint patch_2000[] __initdata = {\n" "- 0x7FFFEFD9,\n" "- 0x3FFD0000,\n" "- 0x7FFB49F7,\n" @@ -195,7 +195,7 @@ "- 0x5F8247F8\n" "-};\n" "-\n" - "-static uint patch_2f00[] __initdata =3D {\n" + "-static uint patch_2f00[] __initdata = {\n" "- 0x3E303430,\n" "- 0x34343737,\n" "- 0xABF7BF9B,\n" @@ -237,7 +237,7 @@ "+MODULE_FIRMWARE(\"freescale/i2c_spi_smc1.bin\");\n" "+MODULE_FIRMWARE(\"freescale/usb_sof.bin\");\n" "\n" - "-static uint patch_2000[] __initdata =3D {\n" + "-static uint patch_2000[] __initdata = {\n" "- 0x3fff0000,\n" "- 0x3ffd0000,\n" "- 0x3ffb0000,\n" @@ -560,7 +560,7 @@ "- 0x6079e2bb\n" "-};\n" "-\n" - "-static uint patch_2f00[] __initdata =3D {\n" + "-static uint patch_2f00[] __initdata = {\n" "- 0x30303030,\n" "- 0x3e3e3434,\n" "- 0xabbf9b99,\n" @@ -627,7 +627,7 @@ "- 0xf22f3f23\n" "-};\n" "-\n" - "-static uint patch_2e00[] __initdata =3D {\n" + "-static uint patch_2e00[] __initdata = {\n" "- 0x27eeeeee,\n" "- 0xeeeeeeee,\n" "- 0xeeeeeeee,\n" @@ -661,10 +661,10 @@ "+ }\n" "\n" "-#ifdef CONFIG_USB_SOF_UCODE_PATCH\n" - "+ for (i =3D 0, src =3D (uint*)fw->data; i < fw->size >> 2; i++)\n" - "+ *dpmem++ =3D *src++;\n" + "+ for (i = 0, src = (uint*)fw->data; i < fw->size >> 2; i++)\n" + "+ *dpmem++ = *src++;\n" "\n" - "-static uint patch_2000[] __initdata =3D {\n" + "-static uint patch_2000[] __initdata = {\n" "- 0x7fff0000,\n" "- 0x7ffd0000,\n" "- 0x7ffb0000,\n" @@ -679,7 +679,7 @@ "- 0x60750000\n" "-};\n" "-\n" - "-static uint patch_2f00[] __initdata =3D {\n" + "-static uint patch_2f00[] __initdata = {\n" "- 0x3030304c,\n" "- 0xcab9e441,\n" "- 0xa1aaf220\n" @@ -703,24 +703,24 @@ " #endif\n" "- int i;\n" "\n" - " commproc =3D cp;\n" + " commproc = cp;\n" "\n" "-#ifdef CONFIG_USB_SOF_UCODE_PATCH\n" - " commproc->cp_rccr =3D 0;\n" + " commproc->cp_rccr = 0;\n" "\n" - "- dp =3D (uint *)(commproc->cp_dpmem);\n" - "- for (i=3D0; i<(sizeof(patch_2000)/4); i++)\n" - "- *dp++ =3D patch_2000[i];\n" + "- dp = (uint *)(commproc->cp_dpmem);\n" + "- for (i=0; i<(sizeof(patch_2000)/4); i++)\n" + "- *dp++ = patch_2000[i];\n" "-\n" - "- dp =3D (uint *)&(commproc->cp_dpmem[0x0f00]);\n" - "- for (i=3D0; i<(sizeof(patch_2f00)/4); i++)\n" - "- *dp++ =3D patch_2f00[i];\n" + "- dp = (uint *)&(commproc->cp_dpmem[0x0f00]);\n" + "- for (i=0; i<(sizeof(patch_2f00)/4); i++)\n" + "- *dp++ = patch_2f00[i];\n" "+#ifdef CONFIG_USB_SOF_UCODE_PATCH\n" "+ if (cpm_copy_firmware((unsigned char*)commproc->cp_dpmem,\n" "+ \"freescale/usb_sof.bin\"))\n" "+ return;\n" "\n" - " commproc->cp_rccr =3D 0x0009;\n" + " commproc->cp_rccr = 0x0009;\n" "\n" " printk(\"USB SOF microcode patch installed\\n\");\n" " #endif /* CONFIG_USB_SOF_UCODE_PATCH */\n" @@ -732,52 +732,51 @@ "+ \"freescale/i2c_spi.bin\"))\n" "+ return;\n" "\n" - "- commproc->cp_rccr =3D 0;\n" + "- commproc->cp_rccr = 0;\n" "+#endif\n" "+#ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH\n" "+ if (cpm_copy_firmware((unsigned char*)commproc->cp_dpmem,\n" "+ \"freescale/i2c_spi_smc1.bin\"))\n" "+ return;\n" "\n" - "- dp =3D (uint *)(commproc->cp_dpmem);\n" - "- for (i=3D0; i<(sizeof(patch_2000)/4); i++)\n" - "- *dp++ =3D patch_2000[i];\n" + "- dp = (uint *)(commproc->cp_dpmem);\n" + "- for (i=0; i<(sizeof(patch_2000)/4); i++)\n" + "- *dp++ = patch_2000[i];\n" "+#endif\n" "\n" - "- dp =3D (uint *)&(commproc->cp_dpmem[0x0f00]);\n" - "- for (i=3D0; i<(sizeof(patch_2f00)/4); i++)\n" - "- *dp++ =3D patch_2f00[i];\n" + "- dp = (uint *)&(commproc->cp_dpmem[0x0f00]);\n" + "- for (i=0; i<(sizeof(patch_2f00)/4); i++)\n" + "- *dp++ = patch_2f00[i];\n" "+#if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \\\n" "+ defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)\n" "\n" - " iip =3D (iic_t *)&commproc->cp_dparam[PROFF_IIC];\n" + " iip = (iic_t *)&commproc->cp_dparam[PROFF_IIC];\n" " # define RPBASE 0x0500\n" "@@ -688,10 +107,6 @@ void __init cpm_load_patch(cpm8xx_t *cp)\n" "\n" " # if defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)\n" "\n" - "- dp =3D (uint *)&(commproc->cp_dpmem[0x0e00]);\n" - "- for (i=3D0; i<(sizeof(patch_2e00)/4); i++)\n" - "- *dp++ =3D patch_2e00[i];\n" + "- dp = (uint *)&(commproc->cp_dpmem[0x0e00]);\n" + "- for (i=0; i<(sizeof(patch_2e00)/4); i++)\n" + "- *dp++ = patch_2e00[i];\n" "-\n" - " commproc->cp_cpmcr1 =3D 0x8080;\n" - " commproc->cp_cpmcr2 =3D 0x808a;\n" - " commproc->cp_cpmcr3 =3D 0x8028;\n" + " commproc->cp_cpmcr1 = 0x8080;\n" + " commproc->cp_cpmcr2 = 0x808a;\n" + " commproc->cp_cpmcr3 = 0x8028;\n" "diff --git a/firmware/Makefile b/firmware/Makefile\n" "index e297e1b..1454d27 100644\n" "--- a/firmware/Makefile\n" "+++ b/firmware/Makefile\n" - "@@ -135,6 +135,9 @@ fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) +=3D \n" + "@@ -135,6 +135,9 @@ fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += \n" "keyspan_pda/xircom_pgs.fw\n" - " fw-shipped-$(CONFIG_USB_VICAM) +=3D vicam/firmware.fw\n" - " fw-shipped-$(CONFIG_VIDEO_CPIA2) +=3D cpia2/stv0672_vp4.bin\n" - " fw-shipped-$(CONFIG_YAM) +=3D yam/1200.bin yam/9600.bin\n" - "+fw_shipped-$(CONFIG_USB_SOF_UCODE_PATCH) +=3D freescale/usb_sof.bin\n" - "+fw_shipped-$(CONFIG_I2C_SPI_UCODE_PATCH) +=3D freescale/i2c_spi.bin\n" - "+fw_shipped-$(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) +=3D freescale/i2c_spi_smc1.=\n" - "bin\n" + " fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw\n" + " fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin\n" + " fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin\n" + "+fw_shipped-$(CONFIG_USB_SOF_UCODE_PATCH) += freescale/usb_sof.bin\n" + "+fw_shipped-$(CONFIG_I2C_SPI_UCODE_PATCH) += freescale/i2c_spi.bin\n" + "+fw_shipped-$(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) += freescale/i2c_spi_smc1.bin\n" "\n" - " fw-shipped-all :=3D $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)\n" + " fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)\n" "\n" "diff --git a/firmware/freescale/i2c_spi.bin.ihex \n" "b/firmware/freescale/i2c_spi.bin.ihex\n" @@ -1833,8 +1832,7 @@ "\n" "\n" "---\n" - "L'absence de virus dans ce courrier =C3=A9lectronique a =C3=A9t=C3=A9 v=C3=\n" - "=A9rifi=C3=A9e par le logiciel antivirus Avast.\n" + "L'absence de virus dans ce courrier \303\251lectronique a \303\251t\303\251 v\303\251rifi\303\251e par le logiciel antivirus Avast.\n" https://www.avast.com/antivirus -196e796e6e4b636cd5a29179dd9c3c4b09adcf7620f9ea1ca3cf3713cabfb355 +febf4c8e99710b0ca85b20f8298882efa9d22ab88f59d7089129452c8b8b84b7
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.