From 91accebdadb10773f4866cae4938ef1102677cb4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 3 Mar 2015 02:15:36 +0000
Subject: [PATCH] alarm/uboot-odroid-c1 to 2011.03-9

---
 alarm/uboot-odroid-c1/PKGBUILD |  4 ++--
 alarm/uboot-odroid-c1/boot.ini | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/alarm/uboot-odroid-c1/PKGBUILD b/alarm/uboot-odroid-c1/PKGBUILD
index 4abcab7a81..e156baf314 100644
--- a/alarm/uboot-odroid-c1/PKGBUILD
+++ b/alarm/uboot-odroid-c1/PKGBUILD
@@ -5,7 +5,7 @@ buildarch=4
 
 pkgname=uboot-odroid-c1
 pkgver=2011.03
-pkgrel=8
+pkgrel=9
 pkgdesc="U-Boot for ODROID-C1"
 arch=('armv7h')
 url="https://github.com/hardkernel/u-boot"
@@ -19,7 +19,7 @@ source=("https://github.com/hardkernel/u-boot/archive/${_commit}.tar.gz"
         '0001-remove-cross-compiling.patch'
         '0002-sd_fusing-tweaks.patch')
 md5sums=('0fc20cde97358ab04b22b946d563e970'
-         '7a064319e3a5460a0a17b6b91613410c'
+         'f191e1ab6910983585ac877f17eed4e7'
          'fb9e00cfdc765b60c61b42060bde6fc2'
          'beeec86a4903a3ce6d1e7956ad9250c4')
 
diff --git a/alarm/uboot-odroid-c1/boot.ini b/alarm/uboot-odroid-c1/boot.ini
index 42ff1e8082..e8111ab2e3 100644
--- a/alarm/uboot-odroid-c1/boot.ini
+++ b/alarm/uboot-odroid-c1/boot.ini
@@ -34,6 +34,16 @@ setenv m_bpp "32"
 # setenv m_bpp "24"
 # setenv m_bpp "16"
 
+# HDMI Hotplug Force (HPD)
+# 1 = Enables HOTPlug Detection
+# 0 = Disables HOTPlug Detection and force the connected status
+setenv hpd "0"
+
+# CEC Enable/Disable (Requires Hardware Modification)
+# 1 = Enables HDMI CEC
+# 0 = Disables HDMI CEC
+setenv cec "0"
+
 # UHS Card Configuration
 # Uncomment the line below to __DISABLE__ UHS-1 MicroSD support
 # This might break boot for some brand models of cards.
@@ -49,7 +59,10 @@ setenv vpu "1"
 # 1 = enabled
 setenv hdmioutput "1"
 
-setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait rw no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs}"
+if test "${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi
+if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
+
+setenv bootargs "console=ttyS0,115200n8 console=tty0 root=/dev/mmcblk0p1 rootwait rw no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec}"
 ext4load mmc 0:1 0x21000000 /boot/uImage
 ext4load mmc 0:1 0x21800000 /boot/dtbs/meson8b_odroidc.dtb
 fdt addr 21800000