Merge branch 'next' of git://git.denx.de/u-boot-avr32

[platform/kernel/u-boot.git] / drivers / qe / qe.c

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index c802014..e914d01 100644 (file)
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -27,7 +27,6 @@
 #include "asm/immap_qe.h"
 #include "qe.h"
 
-#if defined(CONFIG_QE)
 qe_map_t               *qe_immr = NULL;
 static qe_snum_t       snums[QE_NUM_OF_SNUM];
 
@@ -334,7 +333,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
        }
 
        /* Validate some of the fields */
-       if ((firmware->count < 1) || (firmware->count >= MAX_QE_RISC)) {
+       if ((firmware->count < 1) || (firmware->count > MAX_QE_RISC)) {
                printf("Invalid data\n");
                return -EINVAL;
        }
@@ -387,7 +386,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
         * saved microcode information and put in the new.
         */
        memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));
-       strcpy(qe_firmware_info.id, firmware->id);
+       strcpy(qe_firmware_info.id, (char *)firmware->id);
        qe_firmware_info.extended_modes = firmware->extended_modes;
        memcpy(qe_firmware_info.vtraps, firmware->vtraps,
                sizeof(firmware->vtraps));
@@ -466,5 +465,3 @@ U_BOOT_CMD(
        "fw <addr> [<length>] - Upload firmware binary at address <addr> to "
                "the QE,\n\twith optional length <length> verification.\n"
        );
-
-#endif /* CONFIG_QE */