ChromeOS: Remove oprom_is_loaded

A global flag oprom_is_loaded was used to indicate to
U-boot that VGA option ROM was loaded and run, or that
native VGA init was completed on GMA device.

Implement this feature without dependency to CHROMEOS option
and replace use of global variable oprom_is_loaded with call
to gfx_get_init_done().

Change-Id: I7e1afd752f18e5346dabdee62e4f7ea08ada5faf
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4309
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

src/mainboard/google/bolt/chromeos.c

@@ -79,7 +79,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "lid",
 		     get_lid_switch());
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "power", 0);
-	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", oprom_is_loaded);
+	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", gfx_get_init_done());
 }
 #endif
 

src/mainboard/google/butterfly/chromeos.c

@@ -93,7 +93,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Was VGA Option ROM loaded? */
 	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 
 }

src/mainboard/google/falco/chromeos.c

@@ -76,7 +76,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "lid",
 		     get_lid_switch());
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "power", 0);
-	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", oprom_is_loaded);
+	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", gfx_get_init_done());
 }
 #endif
 

src/mainboard/google/link/chromeos.c

@@ -88,7 +88,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Did we load the VGA Option ROM? */
 	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 }
 #endif

src/mainboard/google/link/i915.c

@@ -58,7 +58,6 @@ static unsigned int graphics;
 static unsigned short addrport;
 static unsigned short dataport;
 static unsigned int physbase;
-extern int oprom_is_loaded;
 static u32 htotal, hblank, hsync, vtotal, vblank, vsync;
 
 const u32 link_edid_data[] = {
@@ -379,6 +378,5 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
 	printk(BIOS_SPEW, "%ld microseconds\n", globalmicroseconds());
 	set_vbe_mode_info_valid(&edid, graphics);
 	i915_init_done = 1;
-	oprom_is_loaded = 1;
-	return 0;
+	return i915_init_done;
 }

src/mainboard/google/parrot/chromeos.c

@@ -84,7 +84,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Did we load the VGA Option ROM? */
 	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 
 }

src/mainboard/google/peppy/chromeos.c

@@ -76,7 +76,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "lid",
 		     get_lid_switch());
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "power", 0);
-	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", oprom_is_loaded);
+	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", gfx_get_init_done());
 }
 #endif
 

src/mainboard/google/rambi/chromeos.c

@@ -78,7 +78,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 		     get_developer_mode_switch());
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "lid", get_lid_switch());
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "power", 0);
-	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", oprom_is_loaded);
+	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", gfx_get_init_done());
 }
 #endif
 

src/mainboard/google/slippy/chromeos.c

@@ -76,7 +76,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "lid",
 		     get_lid_switch());
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "power", 0);
-	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", oprom_is_loaded);
+	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", gfx_get_init_done());
 }
 #endif
 

src/mainboard/google/slippy/gma.c

@@ -89,7 +89,6 @@ static unsigned int graphics;
 static unsigned short addrport;
 static unsigned short dataport;
 static unsigned int physbase;
-extern int oprom_is_loaded;
 
 static int ioread = 0, iowrite = 0;
 
@@ -462,10 +461,9 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
 
 	set_vbe_mode_info_valid(&dp->edid, graphics);
 	i915_init_done = 1;
-	oprom_is_loaded = 1;
 	//io_i915_write32( 0x80000000,BLC_PWM_CPU_CTL2);
 	//io_i915_write32( 0x80000000,BLC_PWM_PCH_CTL1);
-	return 1;
+	return i915_init_done;
 
 fail:
 	printk(BIOS_SPEW, "Graphics could not be started;");

src/mainboard/google/stout/chromeos.c

@@ -82,7 +82,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Was VGA Option ROM loaded? */
 	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 
 	/* EC is in RW mode when it isn't in recovery mode. */

src/mainboard/google/stout/i915.c

@@ -41,7 +41,6 @@ static unsigned int graphics;
 static unsigned short addrport;
 static unsigned short dataport;
 static unsigned int physbase;
-extern int oprom_is_loaded;
 
 #define READ32(addr) io_i915_READ32(addr)
 #define WRITE32(val, addr) io_i915_WRITE32(val, addr)
@@ -278,6 +277,5 @@ int i915lightup(unsigned int pphysbase,
 	memset((void *)graphics, 0, 4520*4096);
 	printk(BIOS_SPEW, "%ld microseconds\n", globalmicroseconds());
 	i915_init_done = 1;
-	oprom_is_loaded = 1;
-	return 0;
+	return i915_init_done;
 }

src/mainboard/intel/baskingridge/chromeos.c

@@ -81,7 +81,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Did we load the VGA option ROM? */
 	gpios->gpios[5].port = -1;
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 }
 #endif

src/mainboard/intel/emeraldlake2/chromeos.c

@@ -80,7 +80,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Did we load the VGA option ROM? */
 	gpios->gpios[5].port = -1;
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 }
 #endif

src/mainboard/intel/wtm2/chromeos.c

@@ -61,7 +61,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "developer", DEV_MODE_SETTING);
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "lid", 1); // force open
 	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "power", 0);
-	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", oprom_is_loaded);
+	fill_lb_gpio(gpio++, -1, ACTIVE_HIGH, "oprom", gfx_get_init_done());
 }
 #endif
 

src/mainboard/intel/wtm2/i915.c

@@ -70,7 +70,6 @@ static unsigned int graphics;
 static unsigned short addrport;
 static unsigned short dataport;
 static unsigned int physbase;
-extern int oprom_is_loaded;
 
 const u32 link_edid_data[] = {
 	0xffffff00, 0x00ffffff, 0x0379e430, 0x00000000,
@@ -220,8 +219,7 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
 	 */
 
 	i915_init_done = 1;
-	oprom_is_loaded = 1;
-	return 1;
+	return i915_init_done;
 
 fail:
 	printk(BIOS_SPEW, "Graphics could not be started;");

src/mainboard/lenovo/x60/i915.c

@@ -369,5 +369,5 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
 
 	set_vbe_mode_info_valid(&edid, graphics);
 
-	return 0;
+	return 1;
 }

src/mainboard/samsung/lumpy/chromeos.c

@@ -86,7 +86,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Did we load the VGA Option ROM? */
 	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 }
 #endif

src/mainboard/samsung/stumpy/chromeos.c

@@ -83,7 +83,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Did we load the VGA Option ROM? */
 	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
 	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = oprom_is_loaded;
+	gpios->gpios[5].value = gfx_get_init_done();
 	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
 }
 #endif