diff options
| author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2010-12-08 13:46:36 +0900 | 
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2011-01-11 21:03:26 +0900 | 
| commit | 9980df5616a1561460ea079451db1b57c96131f5 (patch) | |
| tree | 027cab99d5980e0fb583da888ef3dc5ce2807b15 /arch/sh/lib | |
| parent | 858e8977eb30d7d314a6c5783adab5398d18bfd3 (diff) | |
sh: Divided macro for zImage and add asm/zimage.h
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Diffstat (limited to 'arch/sh/lib')
| -rw-r--r-- | arch/sh/lib/bootm.c | 20 | 
1 files changed, 4 insertions, 16 deletions
| diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c index fe23b586916..57273fa4437 100644 --- a/arch/sh/lib/bootm.c +++ b/arch/sh/lib/bootm.c @@ -27,6 +27,7 @@  #include <common.h>  #include <command.h>  #include <asm/byteorder.h> +#include <asm/zimage.h>  #ifdef CONFIG_SYS_DEBUG  static void hexdump(unsigned char *buf, int len) @@ -43,19 +44,6 @@ static void hexdump(unsigned char *buf, int len)  }  #endif -#define MOUNT_ROOT_RDONLY	0x000 -#define RAMDISK_FLAGS		0x004 -#define ORIG_ROOT_DEV		0x008 -#define LOADER_TYPE			0x00c -#define INITRD_START		0x010 -#define INITRD_SIZE			0x014 -#define COMMAND_LINE		0x100 - -#define RD_PROMPT	(1<<15) -#define RD_DOLOAD	(1<<14) -#define CMD_ARG_RD_PROMPT	"prompt_ramdisk=" -#define CMD_ARG_RD_DOLOAD	"load_ramdisk=" -  #ifdef CONFIG_SH_SDRAM_OFFSET  #define GET_INITRD_START(initrd, linux) (initrd - linux + CONFIG_SH_SDRAM_OFFSET)  #else @@ -94,8 +82,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima  	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))  		return 1; -	/* Setup parameters */ -	memset(param, 0, size);	/* Clear zero page */ +	/* Clear zero page */ +	memset(param, 0, size);  	/* Set commandline */  	strcpy(cmdline, bootargs); @@ -127,7 +115,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima  	/* Boot kernel */  	kernel(); -	/* does not return */ +	/* does not return */  	return 1;  } | 
