ofpath: Add support for ethernet and HFI devices

[yaboot.git] / second / cfg.c

diff --git a/second/cfg.c b/second/cfg.c
index fe3f1e1b40d8c78ed4d8d396d42792582ff63904..2787558181a16768f957666b6f9cbc7ae720ac0a 100644 (file)
--- a/second/cfg.c
+++ b/second/cfg.c
@@ -41,8 +41,7 @@ typedef struct {
      void *data;
 } CONFIG;
 
      void *data;
 } CONFIG;
 

-#define MAX_TOKEN 200
-#define MAX_VAR_NAME MAX_TOKEN
+#define MAX_TOKEN 511

 #define EOF -1
 
 CONFIG cf_options[] =
 #define EOF -1
 
 CONFIG cf_options[] =


@@ -92,7 +91,6 @@ CONFIG cf_image[] =
      {cft_flag, "pause-after", NULL},
      {cft_strg, "pause-message", NULL},
      {cft_flag, "novideo", NULL},
      {cft_flag, "pause-after", NULL},
      {cft_strg, "pause-message", NULL},
      {cft_flag, "novideo", NULL},

-     {cft_strg, "sysmap", NULL},

      {cft_end, NULL, NULL}};
 
 static char flag_set;
      {cft_end, NULL, NULL}};
 
 static char flag_set;


@@ -103,7 +101,6 @@ static char *currp = NULL;
 static char *endp = NULL;
 static char *file_name = NULL;
 static CONFIG *curr_table = cf_options;
 static char *endp = NULL;
 static char *file_name = NULL;
 static CONFIG *curr_table = cf_options;

-static int ignore_entry;

 static jmp_buf env;
 
 static struct IMAGES {
 static jmp_buf env;
 
 static struct IMAGES {


@@ -434,12 +431,12 @@ static int cfg_reset ()
     curr_table = cf_options;
     for (walk = curr_table; walk->type != cft_end; walk++) {
 #if DEBUG
     curr_table = cf_options;
     for (walk = curr_table; walk->type != cft_end; walk++) {
 #if DEBUG

-        prom_printf("ItemA %s = %s\n", walk->name, walk->data);
+        prom_printf("ItemA %s = %s\n", walk->name, (char *)walk->data);

 #endif
         if (walk->data != NULL)
             walk->data = NULL;
 #if DEBUG
 #endif
         if (walk->data != NULL)
             walk->data = NULL;
 #if DEBUG

-        prom_printf("ItemB %s = %s\n\n", walk->name, walk->data);
+        prom_printf("ItemB %s = %s\n\n", walk->name, (char *)walk->data);

 #endif
     }
 
 #endif
     }