Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'u-boot/master'

Browse source 
Conflicts:
	drivers/net/Makefile

(trivial merge)
This commit is contained in:
Albert ARIBAUD 2014-05-09 10:47:05 +02:00
commit d2a3e91139
443 changed files with 9779 additions and 38614 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/fdt_support.h
View file

@ -12,6 +12,8 @@
#include <libfdt.h>
u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell,
const char *prop, const u32 dflt);
u32 fdt_getprop_u32_default(const void *fdt, const char *path,
const char *prop, const u32 dflt);
int fdt_chosen(void *fdt, int force);
@ -92,6 +94,8 @@ int fdt_add_edid(void *blob, const char *compat, unsigned char *buf);
int fdt_verify_alias_address(void *fdt, int anode, const char *alias,
u64 addr);
u64 fdt_get_base_address(void *fdt, int node);
int fdt_read_range(void *fdt, int node, int n, uint64_t *child_addr,
uint64_t *addr, uint64_t *len);
enum fdt_status {
FDT_STATUS_OKAY,
@ -122,4 +126,9 @@ static inline int fdt_status_disabled_by_alias(void *fdt, const char* alias)
}
#endif /* ifdef CONFIG_OF_LIBFDT */
#ifdef USE_HOSTCC
int fdtdec_get_int(const void *blob, int node, const char *prop_name,
int default_val);
#endif
#endif /* ifndef __FDT_SUPPORT_H */