summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS1
-rw-r--r--board/st/stm32mp1/MAINTAINERS1
-rw-r--r--common/Makefile3
-rw-r--r--common/common_fit.c3
-rw-r--r--common/spl/spl.c14
-rw-r--r--drivers/mmc/dw_mmc.c4
-rw-r--r--drivers/serial/serial-uclass.c2
-rw-r--r--fs/ubifs/ubifs.c4
-rw-r--r--include/dwmmc.h1
9 files changed, 20 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b39b6fc739..abdb6dcdb5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -233,6 +233,7 @@ ARM STM STM32MP
M: Patrick Delaunay <patrick.delaunay@st.com>
M: Christophe Kerello <christophe.kerello@st.com>
M: Patrice Chotard <patrice.chotard@st.com>
+L: uboot-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-stm32mp
F: drivers/clk/clk_stm32mp1.c
diff --git a/board/st/stm32mp1/MAINTAINERS b/board/st/stm32mp1/MAINTAINERS
index 65266bce3f..48d8fd2c3f 100644
--- a/board/st/stm32mp1/MAINTAINERS
+++ b/board/st/stm32mp1/MAINTAINERS
@@ -1,5 +1,6 @@
STM32MP1 BOARD
M: Patrick Delaunay <patrick.delaunay@st.com>
+L: uboot-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
S: Maintained
F: board/st/stm32mp1
F: include/configs/stm32mp1.h
diff --git a/common/Makefile b/common/Makefile
index 7473b85011..a2388364d9 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -121,6 +121,7 @@ obj-y += command.o
obj-$(CONFIG_$(SPL_)LOG) += log.o
obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o
obj-y += s_record.o
-obj-y += xyzModem.o
+obj-$(CONFIG_CMD_LOADB) += xyzModem.o
+obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o
obj-$(CONFIG_AVB_VERIFY) += avb_verify.o
diff --git a/common/common_fit.c b/common/common_fit.c
index 577b352554..41305d8aa6 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -8,7 +8,6 @@
#include <errno.h>
#include <image.h>
#include <linux/libfdt.h>
-#include <spl.h>
ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
{
@@ -73,7 +72,7 @@ int fit_find_config_node(const void *fdt)
}
if (dflt_conf_node != -ENOENT) {
- debug("Selecting default config '%s'", dflt_conf_desc);
+ debug("Selecting default config '%s'\n", dflt_conf_desc);
return dflt_conf_node;
}
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 292e659c9a..12f9359c0a 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -185,9 +185,8 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,
spl_image->os = IH_OS_U_BOOT;
spl_image->name = "U-Boot";
- debug("spl: payload image: %.*s load addr: 0x%lx size: %d\n",
- (int)sizeof(spl_image->name), spl_image->name,
- spl_image->load_addr, spl_image->size);
+ debug("spl: payload image: %32s load addr: 0x%lx size: %d\n",
+ spl_image->name, spl_image->load_addr, spl_image->size);
#ifdef CONFIG_SPL_FIT_SIGNATURE
images.verify = 1;
@@ -256,9 +255,8 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
}
spl_image->os = image_get_os(header);
spl_image->name = image_get_name(header);
- debug("spl: payload image: %.*s load addr: 0x%lx size: %d\n",
- IH_NMLEN, spl_image->name,
- spl_image->load_addr, spl_image->size);
+ debug("spl: payload image: %32s load addr: 0x%lx size: %d\n",
+ spl_image->name, spl_image->load_addr, spl_image->size);
#else
/* LEGACY image not supported */
debug("Legacy boot image support not enabled, proceeding to other boot methods\n");
@@ -314,7 +312,7 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
image_entry_noargs_t image_entry =
(image_entry_noargs_t)spl_image->entry_point;
- debug("image entry point: 0x%lX\n", spl_image->entry_point);
+ debug("image entry point: 0x%lx\n", spl_image->entry_point);
image_entry();
}
@@ -554,7 +552,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
debug("Unsupported OS image.. Jumping nevertheless..\n");
}
#if CONFIG_VAL(SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
- debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
+ debug("SPL malloc() used 0x%lx bytes (%ld KB)\n", gd->malloc_ptr,
gd->malloc_ptr / 1024);
#endif
#ifdef CONFIG_BOOTSTAGE_STASH
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 3c702b3ed8..7544b84ab6 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -317,6 +317,10 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
} else if (mask & DWMCI_INTMSK_RE) {
debug("%s: Response Error.\n", __func__);
return -EIO;
+ } else if ((cmd->resp_type & MMC_RSP_CRC) &&
+ (mask & DWMCI_INTMSK_RCRC)) {
+ debug("%s: Response CRC Error.\n", __func__);
+ return -EIO;
}
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index e50f0aa851..665cca85cb 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -423,7 +423,7 @@ static int serial_post_probe(struct udevice *dev)
ops->setconfig += gd->reloc_off;
#if CONFIG_POST & CONFIG_SYS_POST_UART
if (ops->loop)
- ops->loop += gd->reloc_off
+ ops->loop += gd->reloc_off;
#endif
#endif
/* Set the baud rate */
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 47fa41ad1d..d5101d3c45 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -125,6 +125,7 @@ crypto_comp_decompress(const struct ubifs_info *c, struct crypto_comp *tfm,
{
struct ubifs_compressor *compr = ubifs_compressors[tfm->compressor];
int err;
+ size_t tmp_len = *dlen;
if (compr->compr_type == UBIFS_COMPR_NONE) {
memcpy(dst, src, slen);
@@ -132,11 +133,12 @@ crypto_comp_decompress(const struct ubifs_info *c, struct crypto_comp *tfm,
return 0;
}
- err = compr->decompress(src, slen, dst, (size_t *)dlen);
+ err = compr->decompress(src, slen, dst, &tmp_len);
if (err)
ubifs_err(c, "cannot decompress %d bytes, compressor %s, "
"error %d", slen, compr->name, err);
+ *dlen = tmp_len;
return err;
return 0;
diff --git a/include/dwmmc.h b/include/dwmmc.h
index 0f9d51b557..4ceda5e43c 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -56,6 +56,7 @@
#define DWMCI_INTMSK_DTO (1 << 3)
#define DWMCI_INTMSK_TXDR (1 << 4)
#define DWMCI_INTMSK_RXDR (1 << 5)
+#define DWMCI_INTMSK_RCRC (1 << 6)
#define DWMCI_INTMSK_DCRC (1 << 7)
#define DWMCI_INTMSK_RTO (1 << 8)
#define DWMCI_INTMSK_DRTO (1 << 9)
View Lorry Controller Status