vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fdt: additions required for arm64 Linux loader

Browse source 
- Add grub_fdt_create_empty_tree() function.
- Add 64-bit setprop.
This commit is contained in:
Leif Lindholm 2013-12-04 13:09:21 +00:00
parent 313fb3cef8
commit c415eaa98f
3 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-22 Leif Lindholm <leif.lindholm@linaro.org>
Add grub_fdt_create_empty_tree() and grub_fdt_set_prop64().
2013-12-22 Vladimir Serbinenko <phcoder@gmail.com>
Add module loading and parsing boot time checkpoints.

29
grub-core/lib/fdt.c
View file

@ -431,3 +431,32 @@ int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name,
grub_memcpy (prop + 3, val, len);
return 0;
}
int
grub_fdt_create_empty_tree (void *fdt, unsigned int size)
{
struct grub_fdt_empty_tree *et;
if (size < GRUB_FDT_EMPTY_TREE_SZ)
return -1;
grub_memset (fdt, 0, size);
et = fdt;
et->empty_node.tree_end = grub_cpu_to_be32_compile_time (FDT_END);
et->empty_node.node_end = grub_cpu_to_be32_compile_time (FDT_END_NODE);
et->empty_node.node_start = grub_cpu_to_be32_compile_time (FDT_BEGIN_NODE);
((struct grub_fdt_empty_tree *) fdt)->header.off_mem_rsvmap =
grub_cpu_to_be32 (ALIGN_UP (sizeof (grub_fdt_header_t), 8));
grub_fdt_set_off_dt_strings (fdt, sizeof (*et));
grub_fdt_set_off_dt_struct (fdt,
sizeof (et->header) + sizeof (et->empty_rsvmap));
grub_fdt_set_version (fdt, FDT_SUPPORTED_VERSION);
grub_fdt_set_last_comp_version (fdt, FDT_SUPPORTED_VERSION);
grub_fdt_set_size_dt_struct (fdt, sizeof (et->empty_node));
grub_fdt_set_totalsize (fdt, size);
grub_fdt_set_magic (fdt, FDT_MAGIC);
return 0;
}

20
include/grub/fdt.h
View file

@ -36,6 +36,19 @@ typedef struct {
grub_uint32_t size_dt_struct;
} grub_fdt_header_t;
struct grub_fdt_empty_tree {
grub_fdt_header_t header;
grub_uint64_t empty_rsvmap[2];
struct {
grub_uint32_t node_start;
grub_uint8_t name[1];
grub_uint32_t node_end;
grub_uint32_t tree_end;
} empty_node;
};
#define GRUB_FDT_EMPTY_TREE_SZ sizeof (struct grub_fdt_empty_tree)
#define grub_fdt_get_header(fdt, field) \
grub_be_to_cpu32(((const grub_fdt_header_t *)(fdt))->field)
#define grub_fdt_set_header(fdt, field, value) \
@ -82,6 +95,7 @@ typedef struct {
#define grub_fdt_set_size_dt_struct(fdt, value) \
grub_fdt_set_header(fdt, size_dt_struct, value)
int grub_fdt_create_empty_tree (void *fdt, unsigned int size);
int grub_fdt_check_header (void *fdt, unsigned int size);
int grub_fdt_check_header_nosize (void *fdt);
int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
@ -97,4 +111,10 @@ int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name,
grub_fdt_set_prop ((fdt), (nodeoffset), (name), &_val, 4); \
})
#define grub_fdt_set_prop64(fdt, nodeoffset, name, val) \
({ \
grub_uint64_t _val = grub_cpu_to_be64(val); \
grub_fdt_set_prop ((fdt), (nodeoffset), (name), &_val, 8); \
})
#endif /* ! GRUB_FDT_HEADER */