Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/27220 )
Change subject: mb/google/poppy/variants/nautilus: Use GPP_B20 to determine SKU ......................................................................
mb/google/poppy/variants/nautilus: Use GPP_B20 to determine SKU
We would use GPP_B20 instead of board id to determine nautilus SKU.
BUG=b:80052672 BRANCH=poppy TEST=Verified the new coreboot could determine SKU correctly
Change-Id: I1978b544eef7a184a3da191306ee32d862fa8c36 Signed-off-by: Seunghwan Kim sh_.kim@samsung.com Reviewed-on: https://review.coreboot.org/27220 Reviewed-by: Furquan Shaikh furquan@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/poppy/variants/nautilus/mainboard.c 1 file changed, 8 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/poppy/variants/nautilus/mainboard.c b/src/mainboard/google/poppy/variants/nautilus/mainboard.c index b4ef1c2..502195e 100644 --- a/src/mainboard/google/poppy/variants/nautilus/mainboard.c +++ b/src/mainboard/google/poppy/variants/nautilus/mainboard.c @@ -13,9 +13,9 @@ * GNU General Public License for more details. */
-#include <boardid.h> #include <baseboard/variants.h> #include <chip.h> +#include <gpio.h> #include <device/device.h> #include <variant/sku.h>
@@ -26,7 +26,13 @@ if (sku_id != SKU_UNKNOWN) return sku_id;
- if (board_id() < 9) + /* + * Nautilus uses GPP_B20 to determine SKU + * 0 - Wifi SKU + * 1 - LTE SKU + */ + gpio_input_pulldown(GPP_B20); + if (!gpio_get(GPP_B20)) sku_id = SKU_0_NAUTILUS; else sku_id = SKU_1_NAUTILUS_LTE;