diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-04 09:11:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-04 09:11:35 -0500 |
| commit | 2e57549a9c34200358d26366f494c3bdcfdea93c (patch) | |
| tree | 7a284f3e0381db0a431b74b2418b797375431026 | |
| parent | 21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a (diff) | |
| parent | acff02c6dd05740ba5fbfaa6e2dd87c01b5c3257 (diff) | |
| download | u-boot-WIP/04Jan2021.zip u-boot-WIP/04Jan2021.tar.gz u-boot-WIP/04Jan2021.tar.bz2 | |
Merge branch '2021-01-04-minor-fixes'WIP/04Jan2021
- Assorted fixes
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | cmd/ubi.c | 5 | ||||
| -rw-r--r-- | doc/android/boot-image.rst | 7 | ||||
| -rw-r--r-- | drivers/nvme/nvme.h | 8 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 2 |
5 files changed, 11 insertions, 12 deletions
@@ -30,6 +30,7 @@ Jagan Teki <jaganna@xilinx.com> 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> @@ -264,6 +264,11 @@ static int ubi_rename_vol(char *oldname, char *newname) 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 @@ next image headers: 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 @@ struct nvme_completion { */ 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 @@ config DM_USB_GADGET 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 |