veyron*: Kill SKIP_DISPLAY_INIT_HACK

Now that we have functioning display code for all platforms,
we can just get rid of this ugly hack used on non-Chromebook
veyrons.

BUG=none
BRANCH=none
TEST=built for Brain, Rialto, Mickey, Romy

Change-Id: Ibe248c7cc74940811345c249d66992d74fe85fe5
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 9c627b087ba9fc07b4ec4a6d55d2e0203bdd4ff5
Original-Change-Id: I946eddb4e8ce1dbaa20212a2bb417e71a31b2ba3
Original-Signed-off-by: David Hendricks <dhendrix@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/282049
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/10785
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
David Hendricks 2015-06-25 17:10:00 -07:00 committed by Patrick Georgi
parent cd500134b1
commit 1f440f60fb
5 changed files with 10 additions and 18 deletions

View File

@ -64,14 +64,6 @@ config CONSOLE_SERIAL_UART_ADDRESS
depends on DRIVERS_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
# FIXME(dhendrix): This is a gross hack intended to get us past
# display init which currently hangs the machine. It will be removed
# once we've re-factored the display init code to properly handle
# various types of displays.
config SKIP_DISPLAY_INIT_HACK
int
default 1
config PMIC_BUS config PMIC_BUS
int int
default 0 default 0

View File

@ -126,3 +126,8 @@ void lb_board(struct lb_header *header)
dma->range_start = (uintptr_t)_dma_coherent; dma->range_start = (uintptr_t)_dma_coherent;
dma->range_size = _dma_coherent_size; dma->range_size = _dma_coherent_size;
} }
void mainboard_power_on_backlight(void)
{
return;
}

View File

@ -64,14 +64,6 @@ config CONSOLE_SERIAL_UART_ADDRESS
depends on DRIVERS_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
# FIXME(dhendrix): This is a gross hack intended to get us past
# display init which currently hangs the machine. It will be removed
# once we've re-factored the display init code to properly handle
# various types of displays.
config SKIP_DISPLAY_INIT_HACK
int
default 1
config PMIC_BUS config PMIC_BUS
int int
default 0 default 0

View File

@ -115,3 +115,8 @@ void lb_board(struct lb_header *header)
dma->range_start = (uintptr_t)_dma_coherent; dma->range_start = (uintptr_t)_dma_coherent;
dma->range_size = _dma_coherent_size; dma->range_size = _dma_coherent_size;
} }
void mainboard_power_on_backlight(void)
{
return;
}

View File

@ -39,11 +39,9 @@ static void soc_init(device_t dev)
ram_resource(dev, 0, (uintptr_t)_dram/KiB, sdram_size_mb()*(MiB/KiB)); ram_resource(dev, 0, (uintptr_t)_dram/KiB, sdram_size_mb()*(MiB/KiB));
if (vboot_skip_display_init()) if (vboot_skip_display_init())
printk(BIOS_INFO, "Skipping display init.\n"); printk(BIOS_INFO, "Skipping display init.\n");
#if !IS_ENABLED(CONFIG_SKIP_DISPLAY_INIT_HACK)
else else
rk_display_init(dev, (uintptr_t)_framebuffer, rk_display_init(dev, (uintptr_t)_framebuffer,
_framebuffer_size); _framebuffer_size);
#endif
} }
static struct device_operations soc_ops = { static struct device_operations soc_ops = {