diff --git a/src/mainboard/google/veyron_danger/mainboard.c b/src/mainboard/google/veyron_danger/mainboard.c
index c2cfa2488e..45e8ed763c 100644
--- a/src/mainboard/google/veyron_danger/mainboard.c
+++ b/src/mainboard/google/veyron_danger/mainboard.c
@@ -104,9 +104,27 @@ static void configure_vop(void)
 	gpio_output(GPIO_BACKLIGHT, 1);	/* BL_EN */
 	gpio_output(GPIO_LCDC_BL, 0);
 
+	rk808_configure_switch(1, 1);	/* VCC33_LCD */
+}
+
+static void configure_hdmi(void)
+{
 	rk808_configure_switch(2, 1);	/* VCC18_LCD (HDMI_AVDD_1V8) */
 	rk808_configure_ldo(7, 1000);	/* VDD10_LCD (HDMI_AVDD_1V0) */
-	rk808_configure_switch(1, 1);	/* VCC33_LCD */
+
+	/* set POWER_HDMI_EN */
+	switch (board_id()) {
+	case 0:
+		gpio_output(GPIO(7, A, 2), 1);
+		break;
+	default:
+		gpio_output(GPIO(5, C, 3), 1);
+		break;
+	}
+
+	/* HDMI I2C */
+	writel(IOMUX_HDMI_EDP_I2C_SDA, &rk3288_grf->iomux_i2c5sda);
+	writel(IOMUX_HDMI_EDP_I2C_SCL, &rk3288_grf->iomux_i2c5scl);
 }
 
 static void mainboard_init(device_t dev)
@@ -118,6 +136,11 @@ static void mainboard_init(device_t dev)
 	configure_emmc();
 	configure_codec();
 	configure_vop();
+	configure_hdmi();
+
+	elog_init();
+	elog_add_watchdog_reset();
+	elog_add_boot_reason();
 }
 
 static void mainboard_enable(device_t dev)