From 4997cbc2b211f6752e54869c636bab5ef808d96b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 14 Feb 2012 11:40:12 -0600
Subject: [PATCH] panda/es: switch to using uEnv.txt boot files by default

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 2a53d02..48fbdf0 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2009-2011 Robert Nelson <robertcnelson@gmail.com>
+# Copyright (c) 2009-2012 Robert Nelson <robertcnelson@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -627,6 +627,46 @@ mmc_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile}
 
 mmcargs=setenv bootargs console=\${console} \${optargs} mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype}
 
+loaduimage=printenv; run mmc_load_uimage; run mmc_load_uinitrd; echo Booting from mmc ...; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
+uenv_normalboot_cmd
+        ;;
+    panda)
+
+cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
+mmc_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile}
+
+mmcargs=setenv bootargs console=\${console} VIDEO_DISPLAY root=\${mmcroot}
+
+loaduimage=printenv; run mmc_load_uimage; run mmc_load_uinitrd; echo Booting from mmc ...; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
+uenv_netinstall_cmd
+
+cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
+optargs=VIDEO_CONSOLE
+
+mmc_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile}
+
+mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype}
+
+loaduimage=printenv; run mmc_load_uimage; run mmc_load_uinitrd; echo Booting from mmc ...; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
+uenv_normalboot_cmd
+        ;;
+    panda_es)
+
+cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
+mmc_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile}
+
+mmcargs=setenv bootargs console=\${console} VIDEO_DISPLAY root=\${mmcroot}
+
+loaduimage=printenv; run mmc_load_uimage; run mmc_load_uinitrd; echo Booting from mmc ...; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
+uenv_netinstall_cmd
+
+cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
+optargs=VIDEO_CONSOLE
+
+mmc_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile}
+
+mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype}
+
 loaduimage=printenv; run mmc_load_uimage; run mmc_load_uinitrd; echo Booting from mmc ...; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 uenv_normalboot_cmd
         ;;
@@ -1548,17 +1588,19 @@ case "$UBOOT_TYPE" in
  BOOTLOADER="PANDABOARD"
  SMSC95XX_MOREMEM=1
  SERIAL="ttyO2"
+ USE_UENV=1
  is_omap
 
         ;;
     panda_es)
 
- SYSTEM=panda
+ SYSTEM=panda_es
  unset IN_VALID_UBOOT
  DO_UBOOT=1
  BOOTLOADER="PANDABOARD_ES"
  SMSC95XX_MOREMEM=1
  SERIAL="ttyO2"
+ USE_UENV=1
  is_omap
 
         ;;