| package/uboot-xburst/patches/001-xburst.patch |
|---|
| 193 | 193 | debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay); |
| 194 | 194 | |
| 195 | 195 | # ifdef CONFIG_BOOT_RETRY_TIME |
| 196 | | @@ -393,7 +397,10 @@ void main_loop (void) |
| 196 | @@ -393,7 +397,12 @@ void main_loop (void) |
| 197 | 197 | } |
| 198 | 198 | else |
| 199 | 199 | #endif /* CONFIG_BOOTCOUNT_LIMIT */ |
| 200 | 200 | - s = getenv ("bootcmd"); |
| 201 | +#if defined(CONFIG_NANONOTE) |
| 201 | 202 | + if (gd->boot_option & BOOT_FROM_SDCARD) |
| 202 | 203 | + s = getenv ("bootcmdfromsd"); |
| 203 | 204 | + else |
| 204 | 205 | + s = getenv ("bootcmd"); |
| 206 | +#endif |
| 205 | 207 | |
| 206 | 208 | debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>"); |
| 207 | 209 | |
| ... | ... | |
| 1650 | 1652 | if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) |
| 1651 | 1653 | return 1; |
| 1652 | 1654 | |
| 1653 | | @@ -98,6 +105,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) |
| 1655 | @@ -98,6 +105,11 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) |
| 1654 | 1656 | } |
| 1655 | 1657 | |
| 1656 | 1658 | /* we assume that the kernel is in place */ |
| 1659 | +#if defined(CONFIG_NANONOTE) |
| 1657 | 1660 | + if (gd->boot_option & BOOT_FROM_SDCARD) |
| 1658 | 1661 | + printf ("\n *** Booting from mircoSD ***\n"); |
| 1659 | 1662 | + |
| 1663 | +#endif |
| 1660 | 1664 | printf ("\nStarting kernel ...\n\n"); |
| 1661 | 1665 | |
| 1662 | 1666 | theKernel (linux_argc, linux_argv, linux_env, 0); |
