diff options
author | David Hendricks <dhendricks@fb.com> | 2017-09-01 20:02:36 -0700 |
---|---|---|
committer | David Hendricks <david.hendricks@gmail.com> | 2017-09-03 19:32:52 +0000 |
commit | 0eb00d4e77d3ad0fceef62b0d2ea69aa4835aa8e (patch) | |
tree | 9860c6d1b56afd370a1fdeaa7a43511ac96aa095 | |
parent | a5216367d5640f07d58a6549fa6df86d91daff1a (diff) | |
download | flashrom-0eb00d4e77d3ad0fceef62b0d2ea69aa4835aa8e.tar.gz flashrom-0eb00d4e77d3ad0fceef62b0d2ea69aa4835aa8e.tar.bz2 flashrom-0eb00d4e77d3ad0fceef62b0d2ea69aa4835aa8e.zip |
Move ich_layout from layout.h to ich_descriptors.h
This moves the ich_layout declaration from one header to another. This
will avoid a circular dependency when we update the entries[] member in
the follow-up patch to use MAX_NUM_FLREGS which is defined in
ich_descriptors.h.
Change-Id: I08006f1f7c9ccdd17a9a6d74881ed2c8541d4de1
Signed-off-by: David Hendricks <dhendricks@fb.com>
Reviewed-on: https://review.coreboot.org/21337
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r-- | ich_descriptors.h | 5 | ||||
-rw-r--r-- | layout.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ich_descriptors.h b/ich_descriptors.h index 4ddc71024..9a16031ef 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -566,6 +566,11 @@ struct ich_descriptors { struct ich_desc_upper_map upper; }; +struct ich_layout { + struct flashrom_layout base; + struct romentry entries[5]; +}; + ssize_t ich_number_of_regions(enum ich_chipset cs, const struct ich_desc_content *content); ssize_t ich_number_of_masters(enum ich_chipset cs, const struct ich_desc_content *content); @@ -57,11 +57,6 @@ struct single_layout { struct romentry entry; }; -struct ich_layout { - struct flashrom_layout base; - struct romentry entries[5]; -}; - struct flashrom_layout *get_global_layout(void); int process_include_args(struct flashrom_layout *); |