Merge branch '2019-03-25-master-imports'

- 3 bugfixes:
  - mmc: Align MMC_TRACE with tiny printf
  - scripts/Makefile.extrawarn: Silence more DTC warnings
  - rsa: check that pointer checksum isn't NULL before using it

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 1c1527cc747465ae6a2d4ec971595675b233ff7e..89b255daf486759c74c8ae2c6c6e3f5369b4108a 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -67,7 +67,7 @@ __weak int board_mmc_getcd(struct mmc *mmc)
 void mmmc_trace_before_send(struct mmc *mmc, struct mmc_cmd *cmd)
 {
        printf("CMD_SEND:%d\n", cmd->cmdidx);
-       printf("\t\tARG\t\t\t 0x%08X\n", cmd->cmdarg);
+       printf("\t\tARG\t\t\t 0x%08x\n", cmd->cmdarg);
 }
 
 void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
@@ -83,21 +83,21 @@ void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
                        printf("\t\tMMC_RSP_NONE\n");
                        break;
                case MMC_RSP_R1:
-                       printf("\t\tMMC_RSP_R1,5,6,7 \t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R1,5,6,7 \t 0x%08x \n",
                                cmd->response[0]);
                        break;
                case MMC_RSP_R1b:
-                       printf("\t\tMMC_RSP_R1b\t\t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R1b\t\t 0x%08x \n",
                                cmd->response[0]);
                        break;
                case MMC_RSP_R2:
-                       printf("\t\tMMC_RSP_R2\t\t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R2\t\t 0x%08x \n",
                                cmd->response[0]);
-                       printf("\t\t          \t\t 0x%08X \n",
+                       printf("\t\t          \t\t 0x%08x \n",
                                cmd->response[1]);
-                       printf("\t\t          \t\t 0x%08X \n",
+                       printf("\t\t          \t\t 0x%08x \n",
                                cmd->response[2]);
-                       printf("\t\t          \t\t 0x%08X \n",
+                       printf("\t\t          \t\t 0x%08x \n",
                                cmd->response[3]);
                        printf("\n");
                        printf("\t\t\t\t\tDUMPING DATA\n");
@@ -107,12 +107,12 @@ void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
                                ptr = (u8 *)&cmd->response[i];
                                ptr += 3;
                                for (j = 0; j < 4; j++)
-                                       printf("%02X ", *ptr--);
+                                       printf("%02x ", *ptr--);
                                printf("\n");
                        }
                        break;
                case MMC_RSP_R3:
-                       printf("\t\tMMC_RSP_R3,4\t\t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R3,4\t\t 0x%08x \n",
                                cmd->response[0]);
                        break;
                default:
@@ -226,7 +226,7 @@ int mmc_send_status(struct mmc *mmc, int timeout)
 
                        if (cmd.response[0] & MMC_STATUS_MASK) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-                               pr_err("Status Error: 0x%08X\n",
+                               pr_err("Status Error: 0x%08x\n",
                                       cmd.response[0]);
 #endif
                                return -ECOMM;

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 9734f6d3bd692451bcf0d91b0d5862ea4d90bbb6..287fcc4d234de50d508db251d1307d2f41e88440 100644 (file)
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -295,7 +295,7 @@ static int rsa_verify_key(struct image_sign_info *info,
 #endif
        struct checksum_algo *checksum = info->checksum;
        struct padding_algo *padding = info->padding;
-       int hash_len = checksum->checksum_len;
+       int hash_len;
 
        if (!prop || !sig || !hash || !checksum)
                return -EIO;
@@ -315,6 +315,7 @@ static int rsa_verify_key(struct image_sign_info *info,
        }
 
        uint8_t buf[sig_len];
+       hash_len = checksum->checksum_len;
 
 #if !defined(USE_HOSTCC)
        ret = uclass_get_device(UCLASS_MOD_EXP, 0, &mod_exp_dev);

diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index 7ed520f55503da14ad75d00563f8790da7c10780..1105c76be12fea84d9bb7909319f70fd8edad98c 100644 (file)
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -74,5 +74,7 @@ DTC_FLAGS += -Wno-unit_address_format
 DTC_FLAGS += -Wno-pci_bridge
 DTC_FLAGS += -Wno-pci_device_bus_num
 DTC_FLAGS += -Wno-pci_device_reg
+DTC_FLAGS += -Wno-avoid_unnecessary_addr_size
+DTC_FLAGS += -Wno-alias_paths
 
 endif