tree/: Move the CrOS host-alias mechanism into its own dispatch
Hook 'host' programmer to alias 'internal' via the proper dispatch
mechanism and remove previous hacks required by the original layering
violations.
BUG=b:148755493
BRANCH=none
TEST=
```
# flashrom -p internal --flash-name 2>&1 | grep vendor
vendor="GigaDevice" name="GD25Q127C/GD25Q128C"
# flashrom -p host --flash-name 2>&1 | grep vendor
vendor="GigaDevice" name="GD25Q127C/GD25Q128C"
# flashrom --flash-name 2>&1 | grep vendor
vendor="GigaDevice" name="GD25Q127C/GD25Q128C"
# flashrom -p ec --flash-name 2>&1 | grep vendor
vendor="Nuvoton" name="NPCX796F"
# flashrom -p ec:type=fp --flash-name 2>&1 | grep vendor
vendor="stm" name="stm32h7x3"
```
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: I86b862365493a781f4b8d5c08609eea2216e84a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2486726
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/programmer.h b/programmer.h
index b2d1964..d673658 100644
--- a/programmer.h
+++ b/programmer.h
@@ -147,23 +147,11 @@
#endif
#if CONFIG_CROS_ALIAS == 1
PROGRAMMER_GOOGLE_EC_ALIAS,
+ PROGRAMMER_GOOGLE_HOST_ALIAS,
#endif
PROGRAMMER_INVALID /* This must always be the last entry. */
};
-enum alias_type {
- ALIAS_NONE = 0, /* no alias (default) */
- ALIAS_HOST, /* chipset / PCH / SoC / etc. */
-};
-
-struct programmer_alias {
- const char *name;
- enum alias_type type;
-};
-
-extern struct programmer_alias *alias;
-extern struct programmer_alias aliases[];
-
/*
* This function returns 'true' if current flashrom invocation is programming
* the EC.
@@ -915,6 +903,7 @@
/* cros_alias.c */
#if CONFIG_CROS_ALIAS == 1
int cros_ec_alias_init(void);
+int cros_host_alias_init(void);
#endif
#endif /* !__PROGRAMMER_H__ */