[U-Boot] [PATCH 2/5] sh: Divided macro for zImage and add asm/zimage.h

[nobuhiro.iwamatsu.yj at renesas.com]

From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
---
 arch/sh/include/asm/zimage.h |   41 +++++++++++++++++++++++++++++++++++++++++
 arch/sh/lib/bootm.c          |   20 ++++----------------
 2 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 arch/sh/include/asm/zimage.h

diff --git a/arch/sh/include/asm/zimage.h b/arch/sh/include/asm/zimage.h
new file mode 100644
index 0000000..33a680b
--- /dev/null
+++ b/arch/sh/include/asm/zimage.h
@@ -0,0 +1,41 @@
+/*
+ * (C) Copyright 2010
+ *   Renesas Solutions Corp.
+ *   Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _ASM_ZIMAGE_H_
+#define _ASM_ZIMAGE_H_
+
+#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="
+
+#endif
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index fe23b58..57273fa 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;
 }
-- 
1.7.2.3