Merge branch '2021-01-04-minor-fixes'
- Assorted fixes
diff --git a/.mailmap b/.mailmap
index 33001f1..b76f022 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,6 +30,7 @@
Jagan Teki <jagannadh.teki@gmail.com>
Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
+Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
Markus Klotzbuecher <mk@denx.de>
Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 171377c..cb14e3e 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -264,6 +264,11 @@
return ENODEV;
}
+ if (!ubi_check(newname)) {
+ printf("%s: volume %s already exist\n", __func__, newname);
+ return EINVAL;
+ }
+
printf("Rename UBI volume %s to %s\n", oldname, newname);
if (ubi->ro_mode) {
diff --git a/doc/android/boot-image.rst b/doc/android/boot-image.rst
index 195da68..fa8f2a4 100644
--- a/doc/android/boot-image.rst
+++ b/doc/android/boot-image.rst
@@ -30,9 +30,10 @@
v2, v1 and v0 formats are backward compatible.
-Android Boot Image format is represented by :c:type:`struct andr_img_hdr` in
-U-Boot, and can be seen in ``include/android_image.h``. U-Boot supports booting
-Android Boot Image and also has associated command
+The Android Boot Image format is represented by
+:c:type:`struct andr_img_hdr <andr_img_hdr>` in U-Boot, and can be seen in
+``include/android_image.h``. U-Boot supports booting Android Boot Image and also
+has associated command
Booting
-------
diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
index 0e8cb22..aa4b3ba 100644
--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
@@ -535,28 +535,20 @@
*/
static inline u64 nvme_readq(__le64 volatile *regs)
{
-#if BITS_PER_LONG == 64
- return readq(regs);
-#else
__u32 *ptr = (__u32 *)regs;
u64 val_lo = readl(ptr);
u64 val_hi = readl(ptr + 1);
return val_lo + (val_hi << 32);
-#endif
}
static inline void nvme_writeq(const u64 val, __le64 volatile *regs)
{
-#if BITS_PER_LONG == 64
- writeq(val, regs);
-#else
__u32 *ptr = (__u32 *)regs;
u32 val_lo = lower_32_bits(val);
u32 val_hi = upper_32_bits(val);
writel(val_lo, ptr);
writel(val_hi, ptr + 1);
-#endif
}
struct nvme_bar {
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index fedc013..6e29119 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -60,7 +60,7 @@
mode)
config SPL_DM_USB_GADGET
- bool "Enable driver model for USB Gadget in sPL"
+ bool "Enable driver model for USB Gadget in SPL"
depends on SPL_DM_USB
help
Enable driver model for USB Gadget in SPL