Merge pull request 'hp-ec-fw' (#172) from Riku_V/lbmk:hp-ec-fw into master

Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/172

5 files changed, 14 insertions, 8 deletions

diff --git a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
index bf50439e..bdc5c4f0 100644
--- a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
@@ -346,9 +346,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../../ec/hp8460p_6360b/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp_68sce_68scf/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../../ec/hp8460p_6360b/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp_68sce_68scf/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000
 
 #
diff --git a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
index 188ef1fd..a62f42d8 100644
--- a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
@@ -344,9 +344,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../../ec/hp8460p_6360b/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp_68sce_68scf/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../../ec/hp8460p_6360b/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp_68sce_68scf/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000
 
 #
diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
index 1cdc018b..2bbd2b13 100644
--- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
@@ -348,9 +348,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../../ec/hp8470pintel/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp_68ice_68icf/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../../ec/hp8470pintel/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp_68ice_68icf/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000
 
 #
diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
index 1821c118..938a1c01 100644
--- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
@@ -346,9 +346,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../../ec/hp8470pintel/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp_68ice_68icf/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../../ec/hp8470pintel/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp_68ice_68icf/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000
 
 #
diff --git a/config/vendor/sources b/config/vendor/sources
index 10545858..7787e38a 100644
--- a/config/vendor/sources
+++ b/config/vendor/sources
@@ -95,6 +95,9 @@
 	SCH5545EC_DL_hash 18261d0f7f27e9de3b0b5a25019b9a934ef1a61cd3f0140e34f38553695e91e671e227a8fa962774edceab5c7804d13ed9fe1c518c5643c7c8f15632f903a6c4
 }
 
+# 68SCF and 68SCE family ROM
+# for 8460p, 8460w, 6460b, 8560p, 6560b, 6360b
+# release notes: https://support.hp.com/soar-attachment/858/col37737-ob-206569-2-ob-206569-2_sp85528_releasedoc.html
 {hp8460pintel}{
 	DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3
 	DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe
@@ -105,6 +108,9 @@
 	EC_url_bkup https://web.archive.org/web/20211231004901/https://ftp.ext.hp.com/pub/softpaq/sp85501-86000/sp85528.exe
 }
 
+# 68ICE or 68ICF family ROM
+# for 8470p, 8470w, 6470b, 8570p, 6570b
+# release notes: https://support.hp.com/soar-attachment/1021/col43350-ob-229442-2-ob-229442-2_sp96091_releasedoc.html
 {hp8470pintel}{
 	DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c
 	DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe