| .. | .. |
|---|
| 17 | 17 | |
|---|
| 18 | 18 | #undef DEBUG_CMDLINE |
|---|
| 19 | 19 | |
|---|
| 20 | +/* |
|---|
| 21 | + * A 32-bit ARC PROM pass arguments and environment as 32-bit pointer. |
|---|
| 22 | + * These macro take care of sign extension. |
|---|
| 23 | + */ |
|---|
| 24 | +#define prom_argv(index) ((char *) (long)argv[(index)]) |
|---|
| 25 | + |
|---|
| 20 | 26 | static char *ignored[] = { |
|---|
| 21 | 27 | "ConsoleIn=", |
|---|
| 22 | 28 | "ConsoleOut=", |
|---|
| .. | .. |
|---|
| 32 | 38 | { "OSLoadOptions=", "" } |
|---|
| 33 | 39 | }; |
|---|
| 34 | 40 | |
|---|
| 35 | | -static char * __init move_firmware_args(char* cp) |
|---|
| 41 | +static char __init *move_firmware_args(int argc, LONG *argv, char *cp) |
|---|
| 36 | 42 | { |
|---|
| 37 | 43 | char *s; |
|---|
| 38 | 44 | int actr, i; |
|---|
| 39 | 45 | |
|---|
| 40 | 46 | actr = 1; /* Always ignore argv[0] */ |
|---|
| 41 | 47 | |
|---|
| 42 | | - while (actr < prom_argc) { |
|---|
| 48 | + while (actr < argc) { |
|---|
| 43 | 49 | for(i = 0; i < ARRAY_SIZE(used_arc); i++) { |
|---|
| 44 | 50 | int len = strlen(used_arc[i][0]); |
|---|
| 45 | 51 | |
|---|
| .. | .. |
|---|
| 64 | 70 | return cp; |
|---|
| 65 | 71 | } |
|---|
| 66 | 72 | |
|---|
| 67 | | -void __init prom_init_cmdline(void) |
|---|
| 73 | +void __init prom_init_cmdline(int argc, LONG *argv) |
|---|
| 68 | 74 | { |
|---|
| 69 | 75 | char *cp; |
|---|
| 70 | 76 | int actr, i; |
|---|
| .. | .. |
|---|
| 76 | 82 | * Move ARC variables to the beginning to make sure they can be |
|---|
| 77 | 83 | * overridden by later arguments. |
|---|
| 78 | 84 | */ |
|---|
| 79 | | - cp = move_firmware_args(cp); |
|---|
| 85 | + cp = move_firmware_args(argc, argv, cp); |
|---|
| 80 | 86 | |
|---|
| 81 | | - while (actr < prom_argc) { |
|---|
| 87 | + while (actr < argc) { |
|---|
| 82 | 88 | for (i = 0; i < ARRAY_SIZE(ignored); i++) { |
|---|
| 83 | 89 | int len = strlen(ignored[i]); |
|---|
| 84 | 90 | |
|---|