Nokia RX-51: Move code from defconfig back to C header file

In commit commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and
CONFIG_PREBOOT to Kconfig") was moved complicated multiline script code
from C header to oneliner in defconfig. After this change multiline to wide
oneliner it is hard to read this code and even harder to debug. Moreover
this script code should be at place where are other scripts, so move it
back to C header file.

Define new env variable preboot which stores this script and in option
CONFIG_PREBOOT calls this preboot variable.

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index f9e5b0e123004ca82aa927708bbc8948a429fcef..5ba9768d029f7c4e897f325d88fcdcccfd4a3214 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -6,7 +6,7 @@ CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_BOOTDELAY=30
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv mmcnum 1; setenv mmcpart 1;setenv mmcscriptfile bootmenu.scr;if run switchmmc; then setenv mmcdone true;setenv mmctype fat;if run scriptload; then true; else setenv mmctype ext2;if run scriptload; then true; else setenv mmctype ext4;if run scriptload; then true; else setenv mmcdone false;fi;fi;fi;if ${mmcdone}; then run scriptboot;fi;fi;if run slide; then true; else setenv bootmenu_delay 0;setenv bootdelay 0;fi"
+CONFIG_PREBOOT="run preboot"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 2f2496ab16a74c3535c2ebc8548a4890faa98b9b..46f18e711085f20605f4f8957fe7c3d180a15242 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -239,6 +239,28 @@ int rx51_kp_getc(struct stdio_dev *sdev);
                "fi\0" \
        "emmcboot=setenv mmcnum 1; run trymmcboot\0" \
        "sdboot=setenv mmcnum 0; run trymmcboot\0" \
+       "preboot=setenv mmcnum 1; setenv mmcpart 1;" \
+               "setenv mmcscriptfile bootmenu.scr;" \
+               "if run switchmmc; then " \
+                       "setenv mmcdone true;" \
+                       "setenv mmctype fat;" \
+                       "if run scriptload; then true; else " \
+                               "setenv mmctype ext2;" \
+                               "if run scriptload; then true; else " \
+                                       "setenv mmctype ext4;" \
+                                       "if run scriptload; then true; else " \
+                                               "setenv mmcdone false;" \
+                                       "fi;" \
+                               "fi;" \
+                       "fi;" \
+                       "if ${mmcdone}; then " \
+                               "run scriptboot;" \
+                       "fi;" \
+               "fi;" \
+               "if run slide; then true; else " \
+                       "setenv bootmenu_delay 0;" \
+                       "setenv bootdelay 0;" \
+               "fi\0" \
        "menucmd=bootmenu\0" \
        "bootmenu_0=Attached kernel=run attachboot\0" \
        "bootmenu_1=Internal eMMC=run emmcboot\0" \