diff options
| author | Tom Rini <trini@ti.com> | 2013-11-11 09:40:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-11 09:40:34 -0500 |
| commit | 60390d70be7336b2441f5f69bd4f5affa83d064d (patch) | |
| tree | 857824f8b7f5f7aaf2f5dac91eea94392818a7a0 /arch/mips/lib/bootm.c | |
| parent | 85b8c5c4bf80025de4632ae6c9a8a606e51508a4 (diff) | |
| parent | a3e80904fb07cda792e636704e3b3950d1446af3 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/lib/bootm.c')
| -rw-r--r-- | arch/mips/lib/bootm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 66340ea470..1febf29865 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR; #define LINUX_MAX_ENVS 256 #define LINUX_MAX_ARGS 256 -#if defined(CONFIG_QEMU_MALTA) -#define mips_boot_qemu_malta 1 +#if defined(CONFIG_MALTA) +#define mips_boot_malta 1 #else -#define mips_boot_qemu_malta 0 +#define mips_boot_malta 0 #endif static int linux_argc; @@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val) strcpy(linux_env_p, env_name); linux_env_p += strlen(env_name); - if (mips_boot_qemu_malta) { + if (mips_boot_malta) { linux_env_p++; linux_env[++linux_env_idx] = linux_env_p; } else { @@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images) if (cp) linux_env_set("eth1addr", cp); - if (mips_boot_qemu_malta) + if (mips_boot_malta) linux_env_set("modetty0", "38400n8r"); } @@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images) bootstage_mark(BOOTSTAGE_ID_RUN_OS); - if (mips_boot_qemu_malta) + if (mips_boot_malta) linux_extra = gd->ram_size; /* we assume that the kernel is in place */ |