Commit 2b8f2d41 authored by balrog's avatar balrog

Optionally setup old style linux bootparams for -kernel, by Juergen Lock.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3089 c046a42c-6fe2-441c-8c8c-71466251a162
parent 59c0149b
......@@ -76,6 +76,77 @@ static void set_kernel_args(uint32_t ram_size, int initrd_size,
stl_raw(p++, 0);
}
static void set_kernel_args_old(uint32_t ram_size, int initrd_size,
const char *kernel_cmdline,
target_phys_addr_t loader_start)
{
uint32_t *p;
unsigned char *s;
/* see linux/include/asm-arm/setup.h */
p = (uint32_t *)(phys_ram_base + KERNEL_ARGS_ADDR);
/* page_size */
stl_raw(p++, 4096);
/* nr_pages */
stl_raw(p++, ram_size / 4096);
/* ramdisk_size */
stl_raw(p++, 0);
#define FLAG_READONLY 1
#define FLAG_RDLOAD 4
#define FLAG_RDPROMPT 8
/* flags */
stl_raw(p++, FLAG_READONLY | FLAG_RDLOAD | FLAG_RDPROMPT);
/* rootdev */
stl_raw(p++, (31 << 8) | 0); /* /dev/mtdblock0 */
/* video_num_cols */
stl_raw(p++, 0);
/* video_num_rows */
stl_raw(p++, 0);
/* video_x */
stl_raw(p++, 0);
/* video_y */
stl_raw(p++, 0);
/* memc_control_reg */
stl_raw(p++, 0);
/* unsigned char sounddefault */
/* unsigned char adfsdrives */
/* unsigned char bytes_per_char_h */
/* unsigned char bytes_per_char_v */
stl_raw(p++, 0);
/* pages_in_bank[4] */
stl_raw(p++, 0);
stl_raw(p++, 0);
stl_raw(p++, 0);
stl_raw(p++, 0);
/* pages_in_vram */
stl_raw(p++, 0);
/* initrd_start */
if (initrd_size)
stl_raw(p++, loader_start + INITRD_LOAD_ADDR);
else
stl_raw(p++, 0);
/* initrd_size */
stl_raw(p++, initrd_size);
/* rd_start */
stl_raw(p++, 0);
/* system_rev */
stl_raw(p++, 0);
/* system_serial_low */
stl_raw(p++, 0);
/* system_serial_high */
stl_raw(p++, 0);
/* mem_fclk_21285 */
stl_raw(p++, 0);
/* zero unused fields */
memset(p, 0, 256 + 1024 -
(p - ((uint32_t *)(phys_ram_base + KERNEL_ARGS_ADDR))));
s = phys_ram_base + KERNEL_ARGS_ADDR + 256 + 1024;
if (kernel_cmdline)
strcpy (s, kernel_cmdline);
else
stb_raw(s, 0);
}
void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename,
int board_id, target_phys_addr_t loader_start)
......@@ -140,6 +211,11 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
bootloader[6] = entry;
for (n = 0; n < sizeof(bootloader) / 4; n++)
stl_raw(phys_ram_base + (n * 4), bootloader[n]);
set_kernel_args(ram_size, initrd_size, kernel_cmdline, loader_start);
if (old_param)
set_kernel_args_old(ram_size, initrd_size,
kernel_cmdline, loader_start);
else
set_kernel_args(ram_size, initrd_size,
kernel_cmdline, loader_start);
}
}
......@@ -197,6 +197,9 @@ const char *option_rom[MAX_OPTION_ROMS];
int nb_option_roms;
int semihosting_enabled = 0;
int autostart = 1;
#ifdef TARGET_ARM
int old_param = 0;
#endif
const char *qemu_name;
int alt_grab = 0;
#ifdef TARGET_SPARC
......@@ -6801,6 +6804,7 @@ enum {
QEMU_OPTION_semihosting,
QEMU_OPTION_name,
QEMU_OPTION_prom_env,
QEMU_OPTION_old_param,
};
typedef struct QEMUOption {
......@@ -6901,6 +6905,9 @@ const QEMUOption qemu_options[] = {
{ "name", HAS_ARG, QEMU_OPTION_name },
#if defined(TARGET_SPARC)
{ "prom-env", HAS_ARG, QEMU_OPTION_prom_env },
#endif
#if defined(TARGET_ARM)
{ "old-param", 0, QEMU_OPTION_old_param },
#endif
{ NULL },
};
......@@ -7675,6 +7682,10 @@ int main(int argc, char **argv)
prom_envs[nb_prom_envs] = optarg;
nb_prom_envs++;
break;
#endif
#ifdef TARGET_ARM
case QEMU_OPTION_old_param:
old_param = 1;
#endif
}
}
......
......@@ -164,6 +164,7 @@ extern int graphic_rotate;
extern int no_quit;
extern int semihosting_enabled;
extern int autostart;
extern int old_param;
extern const char *bootp_filename;
#define MAX_OPTION_ROMS 16
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment