From 9c7060977eff67b7c068a1ac5e49f75d85b124fe Mon Sep 17 00:00:00 2001
From: Evan Wilson <evan@oliodevices.com>
Date: Fri, 9 May 2014 14:19:16 -0700
Subject: Updated pinmux and boot commands

---
 board/olio/h1/pinmux.h     |  8 ++++----
 include/configs/omap3_h1.h | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/board/olio/h1/pinmux.h b/board/olio/h1/pinmux.h
index 64cbf6f67..5bba7c772 100644
--- a/board/olio/h1/pinmux.h
+++ b/board/olio/h1/pinmux.h
@@ -301,10 +301,10 @@ MUX_VAL(CONTROL_PADCONF_SYS_CLKREQ, (IEN | PI | M4 )) /* gpio_1 */\
 MUX_VAL(CONTROL_PADCONF_SYS_NIRQ, (IEN | PU | M7 )) /* safe_mode */\
 MUX_VAL(CONTROL_PADCONF_SYS_NRESWARM, (IEN | PU | M0 )) /* sys_nreswarm */\
 MUX_VAL(CONTROL_PADCONF_SYS_OFF_MODE, (IEN | PD | M7 )) /* safe_mode */\
-MUX_VAL(CONTROL_PADCONF_UART1_CTS, (IEN | PD | M0 )) /* uart1_cts */\
-MUX_VAL(CONTROL_PADCONF_UART1_RTS, (IDIS | PD | M0 )) /* uart1_rts */\
-MUX_VAL(CONTROL_PADCONF_UART1_RX, (IEN | PD | M0 )) /* uart1_rx */\
-MUX_VAL(CONTROL_PADCONF_UART1_TX, (IDIS | PD | M0 )) /* uart1_tx */\
+MUX_VAL(CONTROL_PADCONF_UART1_CTS, (IEN | PU | M0 )) /* uart1_cts */\
+MUX_VAL(CONTROL_PADCONF_UART1_RTS, (IDIS | PU | M0 )) /* uart1_rts */\
+MUX_VAL(CONTROL_PADCONF_UART1_RX, (IEN | PU | M0 )) /* uart1_rx */\
+MUX_VAL(CONTROL_PADCONF_UART1_TX, (IDIS | PU | M0 )) /* uart1_tx */\
 MUX_VAL(CONTROL_PADCONF_UART2_CTS, (IEN | PU | M4 )) /* gpio_144 */\
 MUX_VAL(CONTROL_PADCONF_UART2_RTS, (IEN | PU | M4 )) /* gpio_145 */\
 MUX_VAL(CONTROL_PADCONF_UART2_RX, (IEN | PU | M4 )) /* gpio_147 */\
diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h
index 7ca70e725..d367093d1 100644
--- a/include/configs/omap3_h1.h
+++ b/include/configs/omap3_h1.h
@@ -159,7 +159,7 @@
 	"mmcrootfstype=ext3 rootwait\0" \
 	"nandroot=ubi0:rootfs ubi.mtd=4\0" \
 	"nandrootfstype=ubifs\0" \
-	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
+	"ramroot=/dev/ram0 rw ramdisk_size=8192 initrd=0x81000000,8M\0" \
 	"ramrootfstype=ext2\0" \
 	"nandargs=setenv bootargs console=${console} " \
 		"${optargs} " \
@@ -183,13 +183,24 @@
 		"rootfstype=${ramrootfstype}\0" \
 	"nandboot=echo Booting from nand ...; " \
 		"run nandargs; " \
-		"nand read ${loadaddr} 280000 400000; " \
+		"nand read ${loadaddr} 280000 A00000; " \
 		"bootm ${loadaddr}\0" \
 	"ramboot=echo Booting from ramdisk ...; " \
 		"run ramargs; " \
+		"bootm ${loadaddr}\0" \
+	"h1args=setenv bootargs console=${console} " \
+		"androidboot.console=ttyO2 " \
+		"${optargs} " \
+		"mpurate=${mpurate} " \
+		"vram=${vram} " \
+		"omapfb.mode=dvi:${dvimode} " \
+		"omapfb.vram=0:6M,0:6M " \
+		"omapdss.def_disp=${defaultdisplay}\0" \
+	"h1boot=run h1args; " \
+		"nand read ${loadaddr} 280000 A00000; " \
 		"bootm ${loadaddr}\0"
 #define CONFIG_BOOTCOMMAND \
-	"run nandboot;"
+	"run h1boot;"
 
 #define CONFIG_AUTO_COMPLETE		1
 /*
-- 
cgit v1.2.3-70-g09d2