Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/35065 )
Change subject: mb/google/octopus: Re-assign sku number for vortininja ......................................................................
mb/google/octopus: Re-assign sku number for vortininja
Re-assign sku number for vortininja.
BuG=b:138177049 BRANCH=octopus TEST=emerge-octopus coreboot
Change-Id: I3166a635151fcc7b2e3c0122fa05925cfa5df7d0 Signed-off-by: Wisley Chen wisley.chen@quantatw.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35065 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Marco Chen marcochen@google.com Reviewed-by: Justin TerAvest teravest@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/octopus/variants/meep/include/variant/sku.h M src/mainboard/google/octopus/variants/meep/variant.c 2 files changed, 9 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Justin TerAvest: Looks good to me, approved Marco Chen: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h index 16a4eab..5656d37 100644 --- a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h +++ b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h @@ -17,14 +17,15 @@ #define __MAINBOARD_SKU_H__
enum { - SKU_4_VORTININJA = 4, /* Stylus + rear camera */ - SKU_5_VORTININJA = 5, /* Stylus + no rear camera */ - SKU_6_VORTININJA = 6, /* no Stylus + rear camera */ - SKU_7_VORTININJA = 7, /* no Stylus + no rear camera */ SKU_33_DORP = 33, /* HDMI */ SKU_34_DORP = 34, /* HDMI+Kblight */ SKU_35_DORP = 35, /* HDMI+TS */ SKU_36_DORP = 36, /* HDMI+TS+KBlight */ + SKU_49_VORTININJA = 49, /* Stylus + rear camera */ + SKU_50_VORTININJA = 50, /* Stylus + no rear camera */ + SKU_51_VORTININJA = 51, /* no Stylus + rear camera */ + SKU_52_VORTININJA = 52, /* no Stylus + no rear camera */ + };
#endif /* __MAINBOARD_SKU_H__ */ diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c index ece8ff9..fc34888 100644 --- a/src/mainboard/google/octopus/variants/meep/variant.c +++ b/src/mainboard/google/octopus/variants/meep/variant.c @@ -25,10 +25,10 @@ uint32_t sku_id = get_board_sku();
switch (sku_id) { - case SKU_4_VORTININJA: - case SKU_5_VORTININJA: - case SKU_6_VORTININJA: - case SKU_7_VORTININJA: + case SKU_49_VORTININJA: + case SKU_50_VORTININJA: + case SKU_51_VORTININJA: + case SKU_52_VORTININJA: filename = "wifi_sar-vortininja.hex"; break; }