eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dm-pull-14nov19' of git://git.denx.de/u-boot-dm

Browse Source 
Add OP-TEE test swuit
Fix patman cc_file output
Minor sandbox/pinctrl changes
This commit is contained in:
Tom Rini
2019-11-17 21:15:23 -05:00
parent 14b254b5f5 677dac23d8
commit fd8adc33b8
23 changed files with 426 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/dm/pinctrl.h
View File

@@ -369,19 +369,6 @@ int pinctrl_request_noflags(struct udevice *dev, int func);
*/
int pinctrl_get_periph_id(struct udevice *dev, struct udevice *periph);
/**
* pinctrl_decode_pin_config() - decode pin configuration flags
*
* This decodes some of the PIN_CONFIG values into flags, with each value
* being (1 << pin_cfg). This does not support things with values like the
* slew rate.
*
* @blob: Device tree blob
* @node: Node containing the PIN_CONFIG values
* @return decoded flag value, or -ve on error
*/
int pinctrl_decode_pin_config(const void *blob, int node);
/**
* pinctrl_get_gpio_mux() - get the mux value for a particular GPIO
*

1
include/fdtdec.h
View File

@@ -1061,6 +1061,7 @@ static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle)
* @param basename base name of the node to create
* @param carveout information about the carveout region
* @param phandlep return location for the phandle of the carveout region
* can be NULL if no phandle should be added
* @return 0 on success or a negative error code on failure
*/
int fdtdec_add_reserved_memory(void *blob, const char *basename,

9
include/tee/optee.h
View File

@@ -67,4 +67,13 @@ static inline int optee_verify_bootm_image(unsigned long image_addr,
}
#endif
#if defined(CONFIG_OPTEE) && defined(CONFIG_OF_LIBFDT)
int optee_copy_fdt_nodes(const void *old_blob, void *new_blob);
#else
static inline int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
{
return 0;
}
#endif
#endif /* _OPTEE_H */

14
include/test/optee.h Normal file
View File

@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH
*/
#ifndef __TEST_OPTEE_H__
#define __TEST_OPTEE_H__
#include <test/test.h>
/* Declare a new environment test */
#define OPTEE_TEST(_name, _flags) UNIT_TEST(_name, _flags, optee_test)
#endif /* __TEST_OPTEE_H__ */

1
include/test/suites.h
View File

@@ -28,6 +28,7 @@ int do_ut_compression(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
int do_ut_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_ut_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_ut_lib(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_ut_optee(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_ut_overlay(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);