octopus: add cros_config to support modem fw per model
BUG=b:156447692
TEST=Modem SOC vendor to test both Garg and Droid device to confirm:
Garg will use a different Modem FW than Droid
Change-Id: I839411dabf37c66e247aa952d911d5251f9c503e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/board-overlays/+/2210270
Tested-by: Henry Sun <henrysun@google.com>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Henry Sun <henrysun@google.com>
Commit-Queue: Henry Sun <henrysun@google.com>
(cherry picked from commit cb429baaa1f13d170ab5d87b63145d4191c70e30)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/board-overlays/+/2232043
diff --git a/overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/chromeos-config-bsp-octopus-0.0.1-r87.ebuild b/overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/chromeos-config-bsp-octopus-0.0.1-r88.ebuild
similarity index 100%
rename from overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/chromeos-config-bsp-octopus-0.0.1-r87.ebuild
rename to overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/chromeos-config-bsp-octopus-0.0.1-r88.ebuild
diff --git a/overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/files/model.yaml b/overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/files/model.yaml
index 1497bef..09a92ec 100644
--- a/overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/files/model.yaml
+++ b/overlay-octopus/chromeos-base/chromeos-config-bsp-octopus/files/model.yaml
@@ -351,14 +351,23 @@
config: *clamshell_touchscreen_wl_config
- $sku-id-val: 37
$sub_cras_config: ".droid_lte"
- config: *clamshell_wl_config
+ config:
+ <<: *clamshell_wl_config
+ modem:
+ firmware-variant: "{{$device-name}}"
- $sku-id-val: 38
$sub_cras_config: ".droid_lte"
- config: *clamshell_touchscreen_wl_config
+ config:
+ <<: *clamshell_touchscreen_wl_config
+ modem:
+ firmware-variant: "{{$device-name}}"
- $sku-id-val: 39
$has-keyboard-backlight: "1"
$sub_cras_config: ".droid_lte"
- config: *clamshell_wl_config
+ config:
+ <<: *clamshell_wl_config
+ modem:
+ firmware-variant: "{{$device-name}}"
- $sku-id-val: 40
$has-keyboard-backlight: "1"
$sub_cras_config: ".droid_lte"
@@ -703,9 +712,15 @@
- $sku-id-val: 9
config: *clamshell_wl_config
- $sku-id-val: 17
- config: *clamshell_wl_config
+ config:
+ <<: *clamshell_wl_config
+ modem:
+ firmware-variant: "{{$device-name}}"
- $sku-id-val: 18
- config: *clamshell_wl_config
+ config:
+ <<: *clamshell_wl_config
+ modem:
+ firmware-variant: "{{$device-name}}"
- $sku-id-val: 19
config: *clamshell_wl_config
- $sku-id-val: 20
@@ -761,7 +776,10 @@
config: *convertible_config
- $sku-id-val: 3
$num-mic-locations: 2
- config: *convertible_config
+ config:
+ <<: *convertible_config
+ modem:
+ firmware-variant: "{{$device-name}}"
- $sku-id-val: 4
$num-mic-locations: 2
config: *convertible_config
