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

Change-Id: I08006f1f7c9ccdd17a9a6d74881ed2c8541d4de1
Signed-off-by: David Hendricks <>
Tested-by: build bot (Jenkins) <>
Reviewed-by: Nico Huber <>
2 files changed