59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
|
From aed767e84ab0b6c3b63343a374c3a63b5937580e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Robert Nelson <robertcnelson@gmail.com>
|
||
|
|
Date: Sun, 1 Apr 2012 11:44:25 -0500
|
||
|
|
Subject: [PATCH] panda: convert to uEnv.txt bootscript
|
||
|
|
|
||
|
|
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
||
|
|
---
|
||
|
|
include/configs/omap4_common.h | 28 +++++++++++++++++-----------
|
||
|
|
1 files changed, 17 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
|
||
|
|
index 21e0f60..98994c3 100644
|
||
|
|
--- a/include/configs/omap4_common.h
|
||
|
|
+++ b/include/configs/omap4_common.h
|
||
|
|
@@ -162,23 +162,29 @@
|
||
|
|
"vram=${vram} " \
|
||
|
|
"root=${mmcroot} " \
|
||
|
|
"rootfstype=${mmcrootfstype}\0" \
|
||
|
|
- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
||
|
|
- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
|
||
|
|
- "source ${loadaddr}\0" \
|
||
|
|
+ "bootenv=uEnv.txt\0" \
|
||
|
|
+ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
||
|
|
+ "importbootenv=echo Importing environment from mmc ...; " \
|
||
|
|
+ "env import -t $loadaddr $filesize\0" \
|
||
|
|
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
|
||
|
|
- "mmcboot=echo Booting from mmc${mmcdev} ...; " \
|
||
|
|
+ "mmcboot=echo Booting from mmc ...; " \
|
||
|
|
"run mmcargs; " \
|
||
|
|
"bootm ${loadaddr}\0" \
|
||
|
|
|
||
|
|
#define CONFIG_BOOTCOMMAND \
|
||
|
|
"if mmc rescan ${mmcdev}; then " \
|
||
|
|
- "if run loadbootscript; then " \
|
||
|
|
- "run bootscript; " \
|
||
|
|
- "else " \
|
||
|
|
- "if run loaduimage; then " \
|
||
|
|
- "run mmcboot; " \
|
||
|
|
- "fi; " \
|
||
|
|
- "fi; " \
|
||
|
|
+ "echo SD/MMC found on device ${mmcdev};" \
|
||
|
|
+ "if run loadbootenv; then " \
|
||
|
|
+ "echo Loaded environment from ${bootenv};" \
|
||
|
|
+ "run importbootenv;" \
|
||
|
|
+ "fi;" \
|
||
|
|
+ "if test -n $uenvcmd; then " \
|
||
|
|
+ "echo Running uenvcmd ...;" \
|
||
|
|
+ "run uenvcmd;" \
|
||
|
|
+ "fi;" \
|
||
|
|
+ "if run loaduimage; then " \
|
||
|
|
+ "run mmcboot;" \
|
||
|
|
+ "fi;" \
|
||
|
|
"fi"
|
||
|
|
|
||
|
|
#define CONFIG_AUTO_COMPLETE 1
|
||
|
|
--
|
||
|
|
1.7.9.1
|
||
|
|
|