From e8c2b8667392eee00335fcc0f7161b4864b24619 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Thu, 25 Jun 2015 17:10:00 -0700 Subject: [PATCH] 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: I946eddb4e8ce1dbaa20212a2bb417e71a31b2ba3 Signed-off-by: David Hendricks Reviewed-on: https://chromium-review.googlesource.com/282049 Reviewed-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/285935 --- src/mainboard/google/veyron_brain/Kconfig | 8 -------- src/mainboard/google/veyron_brain/mainboard.c | 5 +++++ src/mainboard/google/veyron_romy/Kconfig | 8 -------- src/mainboard/google/veyron_romy/mainboard.c | 5 +++++ src/soc/rockchip/rk3288/soc.c | 2 -- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index f8bcbed0bb..7a7f8b5ce3 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -79,14 +79,6 @@ 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 0750f90c71..fddae95514 100644 --- a/src/mainboard/google/veyron_brain/mainboard.c +++ b/src/mainboard/google/veyron_brain/mainboard.c @@ -126,3 +126,8 @@ void lb_board(struct lb_header *header) dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } + +void mainboard_power_on_backlight(void) +{ + return; +} diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig index 2d66a9b7c4..0cb16d0bcc 100644 --- a/src/mainboard/google/veyron_romy/Kconfig +++ b/src/mainboard/google/veyron_romy/Kconfig @@ -79,14 +79,6 @@ 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_romy/mainboard.c b/src/mainboard/google/veyron_romy/mainboard.c index a6b27df783..5c27353941 100644 --- a/src/mainboard/google/veyron_romy/mainboard.c +++ b/src/mainboard/google/veyron_romy/mainboard.c @@ -115,3 +115,8 @@ void lb_board(struct lb_header *header) dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } + +void mainboard_power_on_backlight(void) +{ + return; +} diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c index 2133c19b5d..aec7406004 100644 --- a/src/soc/rockchip/rk3288/soc.c +++ b/src/soc/rockchip/rk3288/soc.c @@ -39,11 +39,9 @@ static void soc_init(device_t dev) ram_resource(dev, 0, (uintptr_t)_dram/KiB, sdram_size_mb()*(MiB/KiB)); 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, (uintptr_t)_framebuffer, _framebuffer_size); -#endif } static void soc_noop(device_t dev)