test/py: test_fs: add tests for creating/deleting many files

[oweals/u-boot.git] / common / bootm_os.c

diff --git a/common/bootm_os.c b/common/bootm_os.c
index de0709f8ba08dbc8823ea7e01ad9ff6c3fe456a8..d89ddc32b0d142831fa103476a97692b41d7942d 100644 (file)
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -319,8 +319,8 @@ static void do_bootvx_fdt(bootm_headers_t *images)
        puts("## vxWorks terminated\n");
 }
 
-int do_bootm_vxworks(int flag, int argc, char * const argv[],
-                    bootm_headers_t *images)
+static int do_bootm_vxworks_legacy(int flag, int argc, char * const argv[],
+                                  bootm_headers_t *images)
 {
        if (flag != BOOTM_STATE_OS_GO)
                return 0;
@@ -336,6 +336,41 @@ int do_bootm_vxworks(int flag, int argc, char * const argv[],
 
        return 1;
 }
+
+int do_bootm_vxworks(int flag, int argc, char * const argv[],
+                    bootm_headers_t *images)
+{
+       char *bootargs;
+       int pos;
+       unsigned long vxflags;
+       bool std_dtb = false;
+
+       /* get bootargs env */
+       bootargs = env_get("bootargs");
+
+       if (bootargs != NULL) {
+               for (pos = 0; pos < strlen(bootargs); pos++) {
+                       /* find f=0xnumber flag */
+                       if ((bootargs[pos] == '=') && (pos >= 1) &&
+                           (bootargs[pos - 1] == 'f')) {
+                               vxflags = simple_strtoul(&bootargs[pos + 1],
+                                                        NULL, 16);
+                               if (vxflags & VXWORKS_SYSFLG_STD_DTB)
+                                       std_dtb = true;
+                       }
+               }
+       }
+
+       if (std_dtb) {
+               if (flag & BOOTM_STATE_OS_PREP)
+                       printf("   Using standard DTB\n");
+               return do_bootm_linux(flag, argc, argv, images);
+       } else {
+               if (flag & BOOTM_STATE_OS_PREP)
+                       printf("   !!! WARNING !!! Using legacy DTB\n");
+               return do_bootm_vxworks_legacy(flag, argc, argv, images);
+       }
+}
 #endif
 
 #if defined(CONFIG_CMD_ELF)