qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-03-12 15:59:12 +02:00
Code

insert ifdefs around use of "BOOT_FROM_SDCARD" since it's only available for the NanoNote-target

Browse Source
This commit is contained in:
Mirko Vogt 2010-05-12 23:28:58 +02:00
parent 4ff7a9bf6a
commit 46a096ad46
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/uboot-xburst/patches/001-xburst.patch
View File

@ -193,15 +193,17 @@ index 10d8904..76641f3 100644
debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay); debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay);
# ifdef CONFIG_BOOT_RETRY_TIME # ifdef CONFIG_BOOT_RETRY_TIME
@@ -393,7 +397,10 @@ void main_loop (void) @@ -393,7 +397,12 @@ void main_loop (void)
} }
else else
#endif /* CONFIG_BOOTCOUNT_LIMIT */ #endif /* CONFIG_BOOTCOUNT_LIMIT */
- s = getenv ("bootcmd"); - s = getenv ("bootcmd");
+#if defined(CONFIG_NANONOTE)
+ if (gd->boot_option & BOOT_FROM_SDCARD) + if (gd->boot_option & BOOT_FROM_SDCARD)
+ s = getenv ("bootcmdfromsd"); + s = getenv ("bootcmdfromsd");
+ else + else
+ s = getenv ("bootcmd"); + s = getenv ("bootcmd");
+#endif
debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>"); debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
@ -1650,13 +1652,15 @@ index 54af24c..e6a5732 100644
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1; return 1;
@@ -98,6 +105,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) @@ -98,6 +105,11 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
} }
/* we assume that the kernel is in place */ /* we assume that the kernel is in place */
+#if defined(CONFIG_NANONOTE)
+ if (gd->boot_option & BOOT_FROM_SDCARD) + if (gd->boot_option & BOOT_FROM_SDCARD)
+ printf ("\n *** Booting from mircoSD ***\n"); + printf ("\n *** Booting from mircoSD ***\n");
+ +
+#endif
printf ("\nStarting kernel ...\n\n"); printf ("\nStarting kernel ...\n\n");
theKernel (linux_argc, linux_argv, linux_env, 0); theKernel (linux_argc, linux_argv, linux_env, 0);