diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:25:14 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:53:15 +0100 |
| commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 (patch) | |
| tree | a97493753a119e577161a4fb0b40b8edfc3923bb /include/fdtdec.h | |
| parent | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (diff) | |
| parent | 2c072c958bb544c72f0e848375803dbd6971f022 (diff) | |
| download | talos-obmc-uboot-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.gz talos-obmc-uboot-ab6423cae0323e8db2c8fdd0a99138d93fde2137.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.
Conflicts:
board/samsung/common/board.c
Diffstat (limited to 'include/fdtdec.h')
| -rw-r--r-- | include/fdtdec.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 63027bd4c0..3196cf6683 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -90,6 +90,8 @@ enum fdt_compat_id { COMPAT_INFINEON_SLB9635_TPM, /* Infineon SLB9635 TPM */ COMPAT_INFINEON_SLB9645_TPM, /* Infineon SLB9645 TPM */ COMPAT_SAMSUNG_EXYNOS5_I2C, /* Exynos5 High Speed I2C Controller */ + COMPAT_SANDBOX_HOST_EMULATION, /* Sandbox emulation of a function */ + COMPAT_SANDBOX_LCD_SDL, /* Sandbox LCD emulation with SDL */ COMPAT_COUNT, }; @@ -532,4 +534,22 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node, */ int fdtdec_decode_region(const void *blob, int node, const char *prop_name, void **ptrp, size_t *size); + +/* A flash map entry, containing an offset and length */ +struct fmap_entry { + uint32_t offset; + uint32_t length; +}; + +/** + * Read a flash entry from the fdt + * + * @param blob FDT blob + * @param node Offset of node to read + * @param name Name of node being read + * @param entry Place to put offset and size of this node + * @return 0 if ok, -ve on error + */ +int fdtdec_read_fmap_entry(const void *blob, int node, const char *name, + struct fmap_entry *entry); #endif |
