Change in ...coreboot[master]: vboot: remove VBOOT_EC_EFS Kconfig option

[Joel Kitching (Code Review)]

Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31897

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

vboot: remove VBOOT_EC_EFS Kconfig option

This option has been relocated to depthcharge:
https://crrev.com/c/1523248

BUG=b:124141368, b:124192753
TEST=Build and deploy to eve
TEST=util/lint/checkpatch.pl -g origin/master..HEAD
TEST=util/abuild/abuild -B -e -y -c 50 -p none -x
TEST=make clean && make test-abuild
CQ-DEPEND=CL:1523248
BRANCH=none

Change-Id: I8b3740c8301f9a193f4fce2c6492d9382730faa1
Signed-off-by: Joel Kitching 
---
M src/mainboard/google/fizz/Kconfig
M src/security/vboot/Kconfig
M src/security/vboot/vboot_handoff.c
3 files changed, 0 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31897/1

diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 6f05c24..3c8215b 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -39,7 +39,6 @@

config VBOOT
    select EC_GOOGLE_CHROMEEC_SWITCHES
-	select VBOOT_EC_EFS
    select VBOOT_PHYSICAL_REC_SWITCH
    select HAS_RECOVERY_MRC_CACHE
    select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index a382e67..8d3d83f 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -193,15 +193,6 @@
      Whether the EC (or PD) is slow to update and needs to display a
      screen that informs the user the update is happening.

-config VBOOT_EC_EFS
-	bool
-	default n
-	depends on VBOOT_EC_SOFTWARE_SYNC
-	help
-	  CrosEC can support EFS: Early Firmware Selection. If it's enabled,
-	  software sync need to also support it. This setting tells vboot to
-	  perform EFS software sync.
-
 config VBOOT_PHYSICAL_DEV_SWITCH
    bool
    default n
diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c
index 2bb26a8..eaac76a 100644
--- a/src/security/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -85,8 +85,6 @@
    	vb_sd->flags |= VBSD_EC_SOFTWARE_SYNC;
    	if (CONFIG(VBOOT_EC_SLOW_UPDATE))
    		vb_sd->flags |= VBSD_EC_SLOW_UPDATE;
-		if (CONFIG(VBOOT_EC_EFS))
-			vb_sd->flags |= VBSD_EC_EFS;
    }
    if (!CONFIG(VBOOT_PHYSICAL_REC_SWITCH))
    	vb_sd->flags |= VBSD_BOOT_REC_SWITCH_VIRTUAL;

[Joel Kitching (Code Review)]

Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

Patch Set 1: Code-Review+1

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

Patch Set 1:

Do you also have a change to fix this: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/r...

[Joel Kitching (Code Review)]

Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

Patch Set 1:
> Patch Set 1:
>
> Do you also have a change to fix this: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/r...

Thanks for pointing that out.

https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-ov...

[Joel Kitching (Code Review)]

Hello Aaron Durbin, Julius Werner, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31897

to look at the new patch set (#2).

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

vboot: remove VBOOT_EC_EFS Kconfig option

This option has been relocated to depthcharge:
https://crrev.com/c/1523248

BUG=b:124141368, b:124192753
TEST=Build and deploy to eve
TEST=util/lint/checkpatch.pl -g origin/master..HEAD
TEST=util/abuild/abuild -B -e -y -c 50 -p none -x
TEST=make clean && make test-abuild
CQ-DEPEND=CL:1523248, CL:1525647
BRANCH=none

Change-Id: I8b3740c8301f9a193f4fce2c6492d9382730faa1
Signed-off-by: Joel Kitching 
---
M src/mainboard/google/fizz/Kconfig
M src/security/vboot/Kconfig
M src/security/vboot/vboot_handoff.c
3 files changed, 0 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31897/2

[Joel Kitching (Code Review)]

Hello Aaron Durbin, Julius Werner, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31897

to look at the new patch set (#3).

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

vboot: remove VBOOT_EC_EFS Kconfig option

This option has been relocated to depthcharge:
https://crrev.com/c/1523248

BUG=b:124141368, b:124192753, chromium:943511
TEST=Build and deploy to eve
TEST=util/lint/checkpatch.pl -g origin/master..HEAD
TEST=util/abuild/abuild -B -e -y -c 50 -p none -x
TEST=make clean && make test-abuild
CQ-DEPEND=CL:1523248, CL:1525647
BRANCH=none

Change-Id: I8b3740c8301f9a193f4fce2c6492d9382730faa1
Signed-off-by: Joel Kitching 
---
M src/mainboard/google/fizz/Kconfig
M src/security/vboot/Kconfig
M src/security/vboot/vboot_handoff.c
3 files changed, 0 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31897/3

[Joel Kitching (Code Review)]

Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

Patch Set 3: Code-Review+1

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

Patch Set 3: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

Patch Set 3: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31897 )

Change subject: vboot: remove VBOOT_EC_EFS Kconfig option
......................................................................

vboot: remove VBOOT_EC_EFS Kconfig option

This option has been relocated to depthcharge:
https://crrev.com/c/1523248

BUG=b:124141368, b:124192753, chromium:943511
TEST=Build and deploy to eve
TEST=util/lint/checkpatch.pl -g origin/master..HEAD
TEST=util/abuild/abuild -B -e -y -c 50 -p none -x
TEST=make clean && make test-abuild
CQ-DEPEND=CL:1523248, CL:1525647
BRANCH=none

Change-Id: I8b3740c8301f9a193f4fce2c6492d9382730faa1
Signed-off-by: Joel Kitching 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31897
Reviewed-by: Julius Werner 
Reviewed-by: Furquan Shaikh 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/fizz/Kconfig
M src/security/vboot/Kconfig
M src/security/vboot/vboot_handoff.c
3 files changed, 0 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Julius Werner: Looks good to me, approved
  Joel Kitching: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 6f05c24..3c8215b 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -39,7 +39,6 @@

config VBOOT
    select EC_GOOGLE_CHROMEEC_SWITCHES
-	select VBOOT_EC_EFS
    select VBOOT_PHYSICAL_REC_SWITCH
    select HAS_RECOVERY_MRC_CACHE
    select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index ea5f2a3..de0ee6d 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -208,15 +208,6 @@
      Whether the EC (or PD) is slow to update and needs to display a
      screen that informs the user the update is happening.

-config VBOOT_EC_EFS
-	bool
-	default n
-	depends on VBOOT_EC_SOFTWARE_SYNC
-	help
-	  CrosEC can support EFS: Early Firmware Selection. If it's enabled,
-	  software sync need to also support it. This setting tells vboot to
-	  perform EFS software sync.
-
 config VBOOT_PHYSICAL_DEV_SWITCH
    bool
    default n
diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c
index e64775e..27d89d0 100644
--- a/src/security/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -85,8 +85,6 @@
    	vb_sd->flags |= VBSD_EC_SOFTWARE_SYNC;
    	if (CONFIG(VBOOT_EC_SLOW_UPDATE))
    		vb_sd->flags |= VBSD_EC_SLOW_UPDATE;
-		if (CONFIG(VBOOT_EC_EFS))
-			vb_sd->flags |= VBSD_EC_EFS;
    }
    if (!CONFIG(VBOOT_PHYSICAL_REC_SWITCH))
    	vb_sd->flags |= VBSD_BOOT_REC_SWITCH_VIRTUAL;