[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/1] [media] MFC: Change MFC firmware binary name



Hello,

There is option in menu->"Device Drivers"->"Generic Driver Options"->"External firmware blobs to build into the kernel binary". I have used this many times instead of /lib/firmware mechanism. If someone chooses to add firmware in that way, and gives different name, then this code too can break. So I have proposed another way to solve that. Have a look into this.

Regards,
Subash

On 09/30/2011 05:38 PM, Kamil Debski wrote:
Hi Sachin,

Thanks for the patch. I agree with you - MFC module could be used in other
SoCs as well.

From: Sachin Kamat [mailto:sachin.kamat@xxxxxxxxxx]
Sent: 30 September 2011 12:56

This patches renames the MFC firmware binary to avoid SoC name in it.

Signed-off-by: Sachin Kamat<sachin.kamat@xxxxxxxxxx>

Acked-by: Kamil Debski<k.debski@xxxxxxxxxxx>

---
  drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
b/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
index 5f4da80..f2481a8 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
@@ -38,7 +38,7 @@ int s5p_mfc_alloc_and_load_firmware(struct s5p_mfc_dev
*dev)
  	 * into kernel. */
  	mfc_debug_enter();
  	err = request_firmware((const struct firmware **)&fw_blob,
-				     "s5pc110-mfc.fw", dev->v4l2_dev.dev);
+				     "s5p-mfc.fw", dev->v4l2_dev.dev);
  	if (err != 0) {
  		mfc_err("Firmware is not present in the /lib/firmware directory
nor compiled in kernel\n");
  		return -EINVAL;
@@ -116,7 +116,7 @@ int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev)
  	 * into kernel. */
  	mfc_debug_enter();
  	err = request_firmware((const struct firmware **)&fw_blob,
-				     "s5pc110-mfc.fw", dev->v4l2_dev.dev);
+				     "s5p-mfc.fw", dev->v4l2_dev.dev);
int s5p_mfc_alloc_and_load_firmware(struct s5p_mfc_dev *dev)
{
        struct firmware *fw_blob;
        size_t bank2_base_phys;
        void *b_base;
        int err;
        /* default name */
        char firmware_name[30] = "s5p-mfc.fw";

        /* Firmare has to be present as a separate file or compiled
         * into kernel. */
        mfc_debug_enter();

#ifdef CONFIG_EXTRA_FIRMWARE
        snprintf(firmware_name, sizeof(firmware_name), "%s",
                                        CONFIG_EXTRA_FIRMWARE);
#endif
        err = request_firmware((const struct firmware **)&fw_blob,
                                     firmware_name, dev->v4l2_dev.dev);
        if (err != 0) {
mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
                return -EINVAL;
        }
<snip>

  	if (err != 0) {
  		mfc_err("Firmware is not present in the /lib/firmware directory
nor compiled in kernel\n");
  		return -EINVAL;
--
1.7.4.1

Best regards,
--
Kamil Debski
Linux Platform Group
Samsung Poland R&D Center

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Linux Input]     [Video for Linux]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Photos]     [Yosemite Photos]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Devices]     [Yosemite Backpacking]

Add to Google Powered by Linux