summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-phosphor/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/configuration')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch2
-rw-r--r--meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch12
-rw-r--r--meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch12
3 files changed, 13 insertions, 13 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch
index 5c301a7eb..865b1972a 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch
@@ -171,7 +171,7 @@ index 1451830..2a5ff90 100644
}
],
- "Name": "SOLUM CO IS162F22 PSU$ADDRESS % 4 + 1",
-+ "Name": "$MUX SOLUM CO IS162F22 $ADDRESS % 4 + 1",
++ "Name": "$MUX SOLUM CO IS162F22 PSU$ADDRESS % 4 + 1",
"Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*'})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch
index 4f6679dde..d686b3cff 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch
@@ -37,7 +37,7 @@ index c6c7678..e2eedfa 100644
+ "Drive_3",
+ "Drive_4"
+ ],
-+ "Name": "Drive Mux 1",
++ "Name": "HSBP 1 Mux 1",
+ "Type": "PCA9546Mux"
+ },
+ {
@@ -49,7 +49,7 @@ index c6c7678..e2eedfa 100644
+ "Drive_7",
+ "Drive_8"
+ ],
-+ "Name": "Drive Mux 2",
++ "Name": "HSBP 1 Mux 2",
+ "Type": "PCA9546Mux"
+ },
{
@@ -77,7 +77,7 @@ index c6c7678..e2eedfa 100644
+ "Drive_11",
+ "Drive_12"
+ ],
-+ "Name": "Drive Mux 3",
++ "Name": "HSBP 2 Mux 1",
+ "Type": "PCA9546Mux"
+ },
+ {
@@ -89,7 +89,7 @@ index c6c7678..e2eedfa 100644
+ "Drive_15",
+ "Drive_16"
+ ],
-+ "Name": "Drive Mux 4",
++ "Name": "HSBP 2 Mux 2",
+ "Type": "PCA9546Mux"
+ },
{
@@ -117,7 +117,7 @@ index c6c7678..e2eedfa 100644
+ "Drive_19",
+ "Drive_20"
+ ],
-+ "Name": "Drive Mux 5",
++ "Name": "HSBP 3 Mux 1",
+ "Type": "PCA9546Mux"
+ },
+ {
@@ -129,7 +129,7 @@ index c6c7678..e2eedfa 100644
+ "Drive_23",
+ "Drive_24"
+ ],
-+ "Name": "Drive Mux 6",
++ "Name": "HSBP 3 Mux 2",
+ "Type": "PCA9546Mux"
+ },
{
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch
index a3d065fd9..fad44623d 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch
@@ -30,7 +30,7 @@ index e2eedfa..60e7817 100644
"Drive_4"
],
+ "MuxIdleMode": "Disconnect",
- "Name": "Drive Mux 1",
+ "Name": "HSBP 1 Mux 1",
"Type": "PCA9546Mux"
},
@@ -28,6 +29,7 @@
@@ -38,7 +38,7 @@ index e2eedfa..60e7817 100644
"Drive_8"
],
+ "MuxIdleMode": "Disconnect",
- "Name": "Drive Mux 2",
+ "Name": "HSBP 1 Mux 2",
"Type": "PCA9546Mux"
},
@@ -65,7 +67,7 @@
@@ -55,7 +55,7 @@ index e2eedfa..60e7817 100644
"Drive_12"
],
+ "MuxIdleMode": "Disconnect",
- "Name": "Drive Mux 3",
+ "Name": "HSBP 2 Mux 1",
"Type": "PCA9546Mux"
},
@@ -103,6 +106,7 @@
@@ -63,7 +63,7 @@ index e2eedfa..60e7817 100644
"Drive_16"
],
+ "MuxIdleMode": "Disconnect",
- "Name": "Drive Mux 4",
+ "Name": "HSBP 2 Mux 2",
"Type": "PCA9546Mux"
},
@@ -140,7 +144,7 @@
@@ -80,7 +80,7 @@ index e2eedfa..60e7817 100644
"Drive_20"
],
+ "MuxIdleMode": "Disconnect",
- "Name": "Drive Mux 5",
+ "Name": "HSBP 3 Mux 1",
"Type": "PCA9546Mux"
},
@@ -178,6 +183,7 @@
@@ -88,7 +88,7 @@ index e2eedfa..60e7817 100644
"Drive_24"
],
+ "MuxIdleMode": "Disconnect",
- "Name": "Drive Mux 6",
+ "Name": "HSBP 3 Mux 2",
"Type": "PCA9546Mux"
},
--