diff options
| author | Luo Ji <ji.luo@nxp.com> | 2018-07-03 15:49:37 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2018-08-20 21:25:48 +0800 |
| commit | 4d693897945db29cd4a4fd53f71ad13e865c8420 (patch) | |
| tree | 34e4ae83cbd8b6549a003a41c1bc75c913bc695b /drivers | |
| parent | e735777171768864e856dc5b1831c85af0149e5f (diff) | |
MA-12124 [Android] Fix build warnings for u-boot
Fix build warnings in u-boot.
Change-Id: I1944657d2d89a03c0d2303a22a09538dfaa5fd2c
Signed-off-by: Luo Ji <ji.luo@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/fastboot_lock_unlock.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index e89b7fe7b5..78a267877d 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1959,9 +1959,6 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bool is_recovery_mode = false; char *slot = NULL; -#if defined (CONFIG_ARCH_IMX8) || defined (CONFIG_ARCH_IMX8M) - size_t lz4_len = DST_DECOMPRESS_LEN; -#endif AvbABFlowResult avb_result; AvbSlotVerifyData *avb_out_data; AvbPartitionData *avb_loadpart; @@ -2054,6 +2051,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { (void *)((ulong)hdr + hdr->page_size), hdr->kernel_size); } else { #ifdef CONFIG_LZ4 + size_t lz4_len = DST_DECOMPRESS_LEN; if (ulz4fn((void *)((ulong)hdr + hdr->page_size), hdr->kernel_size, (void *)(ulong)hdr->kernel_addr, &lz4_len) != 0) { printf("Decompress kernel fail!\n"); @@ -2131,7 +2129,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { fdt_size = be32_to_cpu(dt_entry.dt_size); if (fsl_avb_ops.read_from_partition(&fsl_avb_ops, oemimage, be32_to_cpu(dt_entry.dt_offset), fdt_size, - (void *)hdr->second_addr, &num_read) != + (void *)(ulong)hdr->second_addr, &num_read) != AVB_IO_RESULT_OK && num_read != fdt_size) { printf("boota: read fdt error\n"); } diff --git a/drivers/usb/gadget/fastboot_lock_unlock.c b/drivers/usb/gadget/fastboot_lock_unlock.c index c0742fba78..75be430420 100644 --- a/drivers/usb/gadget/fastboot_lock_unlock.c +++ b/drivers/usb/gadget/fastboot_lock_unlock.c @@ -121,6 +121,7 @@ bool valid_tos() { /* * This will return FASTBOOT_LOCK, FASTBOOT_UNLOCK or FASTBOOT_ERROR */ +#ifndef CONFIG_IMX_TRUSTY_OS static FbLockState decrypt_lock_store(unsigned char* bdata) { if (!strncmp((const char *)bdata, "locked", strlen("locked"))) return FASTBOOT_LOCK; @@ -129,7 +130,6 @@ static FbLockState decrypt_lock_store(unsigned char* bdata) { else return FASTBOOT_LOCK_ERROR; } - static inline int encrypt_lock_store(FbLockState lock, unsigned char* bdata) { if (FASTBOOT_LOCK == lock) strncpy((char *)bdata, "locked", strlen("locked")); @@ -139,6 +139,7 @@ static inline int encrypt_lock_store(FbLockState lock, unsigned char* bdata) { return -1; return 0; } +#endif #else static int sha1sum(unsigned char* data, int len, unsigned char* output) { |