leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Tom Rini 2019-03-25 17:26:38 -04:00
commit e7134b9714
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mmc/mmc.c
View File

@ -67,7 +67,7 @@ __weak int board_mmc_getcd(struct mmc *mmc)
void mmmc_trace_before_send(struct mmc *mmc, struct mmc_cmd *cmd) void mmmc_trace_before_send(struct mmc *mmc, struct mmc_cmd *cmd)
{ {
printf("CMD_SEND:%d\n", cmd->cmdidx); 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) 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"); printf("\t\tMMC_RSP_NONE\n");
break; break;
case MMC_RSP_R1: 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]); cmd->response[0]);
break; break;
case MMC_RSP_R1b: 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]); cmd->response[0]);
break; break;
case MMC_RSP_R2: 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]); cmd->response[0]);
printf("\t\t \t\t 0x%08X \n", printf("\t\t \t\t 0x%08x \n",
cmd->response[1]); cmd->response[1]);
printf("\t\t \t\t 0x%08X \n", printf("\t\t \t\t 0x%08x \n",
cmd->response[2]); cmd->response[2]);
printf("\t\t \t\t 0x%08X \n", printf("\t\t \t\t 0x%08x \n",
cmd->response[3]); cmd->response[3]);
printf("\n"); printf("\n");
printf("\t\t\t\t\tDUMPING DATA\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 = (u8 *)&cmd->response[i];
ptr += 3; ptr += 3;
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
printf("%02X ", *ptr--); printf("%02x ", *ptr--);
printf("\n"); printf("\n");
} }
break; break;
case MMC_RSP_R3: 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]); cmd->response[0]);
break; break;
default: default:
@ -226,7 +226,7 @@ int mmc_send_status(struct mmc *mmc, int timeout)
if (cmd.response[0] & MMC_STATUS_MASK) { if (cmd.response[0] & MMC_STATUS_MASK) {
#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) #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]); cmd.response[0]);
#endif #endif
return -ECOMM; return -ECOMM;

3
lib/rsa/rsa-verify.c
View File

@ -295,7 +295,7 @@ static int rsa_verify_key(struct image_sign_info *info,
#endif #endif
struct checksum_algo *checksum = info->checksum; struct checksum_algo *checksum = info->checksum;
struct padding_algo *padding = info->padding; struct padding_algo *padding = info->padding;
int hash_len = checksum->checksum_len; int hash_len;
if (!prop || !sig || !hash || !checksum) if (!prop || !sig || !hash || !checksum)
return -EIO; return -EIO;
@ -315,6 +315,7 @@ static int rsa_verify_key(struct image_sign_info *info,
} }
uint8_t buf[sig_len]; uint8_t buf[sig_len];
hash_len = checksum->checksum_len;
#if !defined(USE_HOSTCC) #if !defined(USE_HOSTCC)
ret = uclass_get_device(UCLASS_MOD_EXP, 0, &mod_exp_dev); ret = uclass_get_device(UCLASS_MOD_EXP, 0, &mod_exp_dev);

2
scripts/Makefile.extrawarn
View File

@ -74,5 +74,7 @@ DTC_FLAGS += -Wno-unit_address_format
DTC_FLAGS += -Wno-pci_bridge DTC_FLAGS += -Wno-pci_bridge
DTC_FLAGS += -Wno-pci_device_bus_num DTC_FLAGS += -Wno-pci_device_bus_num
DTC_FLAGS += -Wno-pci_device_reg DTC_FLAGS += -Wno-pci_device_reg
DTC_FLAGS += -Wno-avoid_unnecessary_addr_size
DTC_FLAGS += -Wno-alias_paths
endif endif