diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:00:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:00:00 -0500 |
| commit | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (patch) | |
| tree | e42c7fd72cb1ef97a5a05a73b06b3cd2fc118147 /lib | |
| parent | 6c016485a685b5cdac28edb25147311a3e88d51f (diff) | |
| parent | fe5b9b447c6eea3873833b1f3ba15c9854aa2ef8 (diff) | |
| download | u-boot-746667f1e56bf08d03e66a178df3c4f4f6c806e1.tar.gz u-boot-746667f1e56bf08d03e66a178df3c4f4f6c806e1.tar.xz u-boot-746667f1e56bf08d03e66a178df3c4f4f6c806e1.zip | |
Merge git://git.denx.de/u-boot-x86
Conflicts:
arch/x86/cpu/Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asm-offsets.c | 3 | ||||
| -rw-r--r-- | lib/fdtdec.c | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index 129bc3e2af..580f763da6 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -31,6 +31,9 @@ int main(void) #ifdef CONFIG_SYS_MALLOC_F_LEN DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base)); #endif +#ifdef CONFIG_X86 + DEFINE(GD_BIST, offsetof(struct global_data, arch.bist)); +#endif #if defined(CONFIG_ARM) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 9714620ab3..aafc4f9315 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -73,6 +73,8 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"), COMPAT(PARADE_PS8625, "parade,ps8625"), COMPAT(COMPAT_INTEL_LPC, "intel,lpc"), + COMPAT(INTEL_MICROCODE, "intel,microcode"), + COMPAT(MEMORY_SPD, "memory-spd"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) @@ -485,6 +487,26 @@ int fdtdec_get_int_array(const void *blob, int node, const char *prop_name, return err; } +int fdtdec_get_int_array_count(const void *blob, int node, + const char *prop_name, u32 *array, int count) +{ + const u32 *cell; + int len, elems; + int i; + + debug("%s: %s\n", __func__, prop_name); + cell = fdt_getprop(blob, node, prop_name, &len); + if (!cell) + return -FDT_ERR_NOTFOUND; + elems = len / sizeof(u32); + if (count > elems) + count = elems; + for (i = 0; i < count; i++) + array[i] = fdt32_to_cpu(cell[i]); + + return count; +} + const u32 *fdtdec_locate_array(const void *blob, int node, const char *prop_name, int count) { |