From 0eb00d4e77d3ad0fceef62b0d2ea69aa4835aa8e Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Fri, 1 Sep 2017 20:02:36 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/21337 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- ich_descriptors.h | 5 +++++ 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); diff --git a/layout.h b/layout.h index c93d7549e..f32dc8293 100644 --- a/layout.h +++ b/layout.h @@ -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 *); -- cgit v1.2.3