Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sandbox: Complete migration away from os_malloc()

Browse source 
Now that we can use direct access to the system malloc() in sandbox, drop
the remaining uses of os_malloc().

The only one remaining now is for the RAM buffer, which we do want to be
at a known address, so this is intended.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-02-03 07:36:18 -07:00
parent f217651575
commit 21d651fb29
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/misc/cros_ec_sandbox.c
View file

@ -11,10 +11,10 @@
#include <ec_commands.h> #include <ec_commands.h>
#include <errno.h> #include <errno.h>
#include <hash.h> #include <hash.h>
#include <malloc.h>
#include <os.h> #include <os.h>
#include <u-boot/sha256.h> #include <u-boot/sha256.h>
#include <spi.h> #include <spi.h>
#include <asm/malloc.h>
#include <asm/state.h> #include <asm/state.h>
#include <asm/sdl.h> #include <asm/sdl.h>
#include <linux/input.h> #include <linux/input.h>
@ -115,7 +115,7 @@ static int cros_ec_read_state(const void *blob, int node)
prop = fdt_getprop(blob, node, "flash-data", &len); prop = fdt_getprop(blob, node, "flash-data", &len);
if (prop) { if (prop) {
ec->flash_data_len = len; ec->flash_data_len = len;
ec->flash_data = os_malloc(len); ec->flash_data = malloc(len);
if (!ec->flash_data) if (!ec->flash_data)
return -ENOMEM; return -ENOMEM;
memcpy(ec->flash_data, prop, len); memcpy(ec->flash_data, prop, len);
@ -545,14 +545,14 @@ int cros_ec_probe(struct udevice *dev)
ec->flash_data_len != ec->ec_config.flash.length) { ec->flash_data_len != ec->ec_config.flash.length) {
printf("EC data length is %x, expected %x, discarding data\n", printf("EC data length is %x, expected %x, discarding data\n",
ec->flash_data_len, ec->ec_config.flash.length); ec->flash_data_len, ec->ec_config.flash.length);
os_free(ec->flash_data); free(ec->flash_data);
ec->flash_data = NULL; ec->flash_data = NULL;
} }
/* Otherwise allocate the memory */ /* Otherwise allocate the memory */
if (!ec->flash_data) { if (!ec->flash_data) {
ec->flash_data_len = ec->ec_config.flash.length; ec->flash_data_len = ec->ec_config.flash.length;
ec->flash_data = os_malloc(ec->flash_data_len); ec->flash_data = malloc(ec->flash_data_len);
if (!ec->flash_data) if (!ec->flash_data)
return -ENOMEM; return -ENOMEM;
} }