redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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>
zero-sugar
Luo Ji 2018-07-03 15:49:37 +08:00 committed by Ji Luo
parent e735777171
commit 4d69389794
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/freescale/imx8mq_phanbell/spl.c
View File

@ -149,7 +149,6 @@ int power_init_board(void)
{
struct pmic *p;
int ret;
unsigned int reg;
ret = power_bd71837_init(I2C_PMIC);
if (ret)

1
common/board_r.c
View File

@ -678,6 +678,7 @@ static int initr_check_fastboot(void)
#ifdef CONFIG_IMX_TRUSTY_OS
extern void tee_setup(void);
void tee_setup(void);
static int initr_tee_setup(void)
{
tee_setup();

6
drivers/usb/gadget/f_fastboot.c
View File

@ -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");
}

3
drivers/usb/gadget/fastboot_lock_unlock.c
View File

@ -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) {

1
lib/trusty/ql-tipc/libtipc.c
View File

@ -37,6 +37,7 @@ static struct trusty_ipc_dev *_ipc_dev;
static struct trusty_dev _tdev; /* There should only be one trusty device */
static void *rpmb_ctx;
void rpmb_storage_put_ctx(void *dev);
void trusty_ipc_shutdown(void)
{
(void)rpmb_storage_proxy_shutdown(_ipc_dev);