yair/u-boot-tk1-som
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse Source
This commit is contained in:
Tom Rini
2016-03-14 19:21:44 -04:00
parent 9f0f432c0a 608e399fde
commit 88033d737d
121 changed files with 1738 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/fdtdec.c
View File

@@ -123,9 +123,10 @@ fdt_addr_t fdtdec_get_addr_size_fixed(const void *blob, int node,
if (sizep) {
*sizep = fdtdec_get_number(prop_size, ns);
debug("addr=%08llx, size=%llx\n", (u64)addr, (u64)*sizep);
debug("addr=%08llx, size=%llx\n", (unsigned long long)addr,
(unsigned long long)*sizep);
} else {
debug("addr=%08llx\n", (u64)addr);
debug("addr=%08llx\n", (unsigned long long)addr);
}
return addr;

2
lib/gunzip.c
View File

@@ -105,7 +105,7 @@ void gzwrite_progress_finish(int returnval,
}
int gzwrite(unsigned char *src, int len,
struct block_dev_desc *dev,
struct blk_desc *dev,
unsigned long szwritebuf,
u64 startoffs,
u64 szexpected)

6
lib/tpm.c
View File

@@ -242,7 +242,7 @@ static uint32_t tpm_sendrecv_command(const void *command,
response_length = sizeof(response_buffer);
}
ret = uclass_first_device(UCLASS_TPM, &dev);
ret = uclass_first_device_err(UCLASS_TPM, &dev);
if (ret)
return ret;
err = tpm_xfer(dev, command, tpm_command_size(command),
@@ -261,8 +261,8 @@ int tpm_init(void)
int err;
struct udevice *dev;
err = uclass_first_device(UCLASS_TPM, &dev);
if (err || !dev)
err = uclass_first_device_err(UCLASS_TPM, &dev);
if (err)
return err;
return tpm_open(dev);
}