diff options
| author | Philip Chen <philipchen@google.com> | 2021-07-01 16:28:17 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-02 03:07:32 +0000 |
| commit | a9e3d03396e664288e9bfe781e15648167e6d862 (patch) | |
| tree | d354e49555474e9bcb75684d68b77d320e0821b7 /include | |
| parent | 0258161c11bf20414134d15d89aeb4ca25016c95 (diff) | |
| download | chrome-ec-a9e3d03396e664288e9bfe781e15648167e6d862.tar.gz | |
cbi: Remove cbi_eeprom.h
Move the declaration of cbi_config to cros_board_info.h so that
we can get rid of cbi_eeprom.h.
BRANCH=None
BUG=b:186264627
TEST=make buildall -j
Change-Id: I6780542c6428090117d879945d901fe82ce999f4
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3002446
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/cbi_eeprom.h | 14 | ||||
| -rw-r--r-- | include/cros_board_info.h | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/include/cbi_eeprom.h b/include/cbi_eeprom.h deleted file mode 100644 index 88b54465e8..0000000000 --- a/include/cbi_eeprom.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Cros Board Info EEPROM - */ -#ifndef __CROS_EC_CBI_EEPROM_H -#define __CROS_EC_CBI_EEPROM_H - -#include "cros_board_info.h" - -extern const struct cbi_storage_config_t cbi_config; - -#endif /* __CROS_EC_CBI_EEPROM_H */ diff --git a/include/cros_board_info.h b/include/cros_board_info.h index f4fa905573..5d7f82fb40 100644 --- a/include/cros_board_info.h +++ b/include/cros_board_info.h @@ -65,10 +65,10 @@ struct cbi_storage_driver { int (*is_protected)(void); }; -struct cbi_storage_config_t { +extern const struct cbi_storage_config_t { enum cbi_storage_type storage_type; const struct cbi_storage_driver *drv; -}; +} cbi_config; /** * Board info accessors |