diff options
| -rw-r--r-- | src/mainboard/google/veyron_brain/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_brain/mainboard.c | 6 | ||||
| -rw-r--r-- | src/soc/rockchip/rk3288/soc.c | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index 94f1a4b0d6..3539d1ee2b 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -73,6 +73,14 @@ config CONSOLE_SERIAL_UART_ADDRESS depends on CONSOLE_SERIAL_UART 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 int default 0 diff --git a/src/mainboard/google/veyron_brain/mainboard.c b/src/mainboard/google/veyron_brain/mainboard.c index 13990d9493..ab6ceab502 100644 --- a/src/mainboard/google/veyron_brain/mainboard.c +++ b/src/mainboard/google/veyron_brain/mainboard.c @@ -111,9 +111,3 @@ void lb_board(struct lb_header *header) dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } - -/* called from rk3288 display.c, but there is no backlight for this platform */ -void mainboard_power_on_backlight(void) -{ - return; -} diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c index c227dab2f3..abd93d70f0 100644 --- a/src/soc/rockchip/rk3288/soc.c +++ b/src/soc/rockchip/rk3288/soc.c @@ -42,8 +42,10 @@ static void soc_init(device_t dev) if (vboot_skip_display_init()) printk(BIOS_INFO, "Skipping display init.\n"); +#if !IS_ENABLED(CONFIG_SKIP_DISPLAY_INIT_HACK) else rk_display_init(dev, lcdbase, fb_size); +#endif } static struct device_operations soc_ops = { |