diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-08-07 15:24:59 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-28 13:26:10 -0500 |
| commit | 36cd52a00794fb15ffab05d640acca92d7482993 (patch) | |
| tree | ecc6af2e423fc9dd7c6c4469411644d6575c9b0f | |
| parent | c8054bc12e00669bd7588f2b30fef48aa94babac (diff) | |
| download | u-boot-imx-36cd52a00794fb15ffab05d640acca92d7482993.zip u-boot-imx-36cd52a00794fb15ffab05d640acca92d7482993.tar.gz u-boot-imx-36cd52a00794fb15ffab05d640acca92d7482993.tar.bz2 | |
Blackfin: convert CMD_LINE_ADDR to CONFIG_LINUX_CMDLINE_{ADDR,SIZE}
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | include/asm-blackfin/blackfin-config-post.h | 7 | ||||
| -rw-r--r-- | lib_blackfin/bootm.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index 0ab68ac..936001a 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -65,8 +65,11 @@ #endif /* Using L1 scratch pad makes sense for everyone by default. */ -#ifndef CMD_LINE_ADDR -# define CMD_LINE_ADDR L1_SRAM_SCRATCH +#ifndef CONFIG_LINUX_CMDLINE_ADDR +# define CONFIG_LINUX_CMDLINE_ADDR L1_SRAM_SCRATCH +#endif +#ifndef CONFIG_LINUX_CMDLINE_SIZE +# define CONFIG_LINUX_CMDLINE_SIZE L1_SRAM_SCRATCH_SIZE #endif #endif diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c index 195eb9c..2954ce6 100644 --- a/lib_blackfin/bootm.c +++ b/lib_blackfin/bootm.c @@ -20,14 +20,14 @@ extern void swap_to(int device_id); static char *make_command_line(void) { - char *dest = (char *)CMD_LINE_ADDR; + char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR; char *bootargs = getenv("bootargs"); if (bootargs == NULL) return NULL; - strncpy(dest, bootargs, 0x1000); - dest[0xfff] = 0; + strncpy(dest, bootargs, CONFIG_LINUX_CMDLINE_SIZE); + dest[CONFIG_LINUX_CMDLINE_SIZE - 1] = 0; return dest; } |