Change in coreboot[master]: drivers/intel/fsp2_0/logo.c: Correct check for logo_size

[Wim Vervoorn (Code Review)]

Wim Vervoorn has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

drivers/intel/fsp2_0/logo.c: Correct check for logo_size

The check to validate if the logo file was loaded correctly was
incorrect.

Now check the actual logo size.

BUG=N/A
TEST=build

Change-Id: Ib3a808dd831986e8347512892ee88983d376d34c
Signed-off-by: Wim Vervoorn 
---
M src/drivers/intel/fsp2_0/logo.c
1 file changed, 1 insertion(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/38124/1

diff --git a/src/drivers/intel/fsp2_0/logo.c b/src/drivers/intel/fsp2_0/logo.c
index ba2b5dc..1a9152f 100644
--- a/src/drivers/intel/fsp2_0/logo.c
+++ b/src/drivers/intel/fsp2_0/logo.c
@@ -26,7 +26,7 @@
    	if (logo_buffer) {
    		*logo_size = cbfs_boot_load_file("logo.bmp", (void *)logo_buffer,
    						1 * MiB, CBFS_TYPE_RAW);
-			if (logo_size)
+			if (*logo_size)
    			*logo_ptr = (UINT32)logo_buffer;
    	}
    }

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

Patch Set 2: Code-Review+1

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

Patch Set 2: Code-Review+2

Why not fix both copies of the code at once?

[Frans Hendriks (Code Review)]

Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

Patch Set 2: Code-Review+2

[Wim Vervoorn (Code Review)]

Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

Patch Set 2:
> Patch Set 2: Code-Review+2
>
> Why not fix both copies of the code at once?

I considered doing that but as both items were committed as separate items I decided to submit the patches separate as well. Doing this in one patch would have been fine as well as it the same change.

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

Patch Set 2:
> > Why not fix both copies of the code at once?
>
> I considered doing that but as both items were committed as separate items I decided to submit the patches separate as well. Doing this in one patch would have been fine as well as it the same change.

I somehow managed to miss the other changes even though they
were pushed at the same time ._.

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38124 )

Change subject: drivers/intel/fsp2_0/logo.c: Correct check for logo_size
......................................................................

drivers/intel/fsp2_0/logo.c: Correct check for logo_size

The check to validate if the logo file was loaded correctly was
incorrect.

Now check the actual logo size.

BUG=N/A
TEST=build

Change-Id: Ib3a808dd831986e8347512892ee88983d376d34c
Signed-off-by: Wim Vervoorn 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38124
Reviewed-by: Paul Menzel 
Reviewed-by: Nico Huber 
Reviewed-by: Frans Hendriks 
Tested-by: build bot (Jenkins) 
---
M src/drivers/intel/fsp2_0/logo.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve
  Frans Hendriks: Looks good to me, approved

diff --git a/src/drivers/intel/fsp2_0/logo.c b/src/drivers/intel/fsp2_0/logo.c
index ba2b5dc..1a9152f 100644
--- a/src/drivers/intel/fsp2_0/logo.c
+++ b/src/drivers/intel/fsp2_0/logo.c
@@ -26,7 +26,7 @@
    	if (logo_buffer) {
    		*logo_size = cbfs_boot_load_file("logo.bmp", (void *)logo_buffer,
    						1 * MiB, CBFS_TYPE_RAW);
-			if (logo_size)
+			if (*logo_size)
    			*logo_ptr = (UINT32)logo_buffer;
    	}
    }