summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2015-06-25 18:03:12 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-07-06 09:42:38 +0200
commitcd500134b18fd579dd912df0a3c227458935d4fe (patch)
treece46f4a2668694c83982da961cc18840daf73733 /src
parent9150e5e0f26a1f2908d8ab95c2f82e3ccad423dc (diff)
downloadcoreboot-cd500134b18fd579dd912df0a3c227458935d4fe.tar.xz
veyron_rialto: Use VOP_MODE_NONE for display init.
This uses VOP_MODE_NONE for display init on veyron_rialto and adds a mainboard_power_on_backlight() stub so that we can finally get rid of SKIP_DISPLAY_INIT_HACK. BUG=none BRANCH=none TEST=built for veyron_rialto Change-Id: Ia6b420a962fe266e773c804b8e5c68da35848753 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: a290c938c163759a3672c07d8ec7c0a38057b13d Original-Change-Id: Iec2d7f03857198a4d6f7490db1e3e19c74f18c43 Original-Signed-off-by: David Hendricks <dhendrix@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/282048 Reviewed-on: http://review.coreboot.org/10784 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/veyron_rialto/Kconfig8
-rw-r--r--src/mainboard/google/veyron_rialto/devicetree.cb1
-rw-r--r--src/mainboard/google/veyron_rialto/mainboard.c1
3 files changed, 2 insertions, 8 deletions
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 30c54f6a30..1886db93cd 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -63,14 +63,6 @@ config CONSOLE_SERIAL_UART_ADDRESS
depends on DRIVERS_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_rialto/devicetree.cb b/src/mainboard/google/veyron_rialto/devicetree.cb
index 4c2ea8f709..c40bbbbc4e 100644
--- a/src/mainboard/google/veyron_rialto/devicetree.cb
+++ b/src/mainboard/google/veyron_rialto/devicetree.cb
@@ -21,5 +21,6 @@
chip soc/rockchip/rk3288
device cpu_cluster 0 on end
register "vop_id" = "1"
+ register "vop_mode" = "VOP_MODE_NONE"
register "framebuffer_bits_per_pixel" = "16"
end
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index 6e3e51baf5..52a27bbcd3 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -108,4 +108,5 @@ void lb_board(struct lb_header *header)
void mainboard_power_on_backlight(void)
{
+ return;
}