Commit 9980df5616a1561460ea079451db1b57c96131f5
Committed by
Nobuhiro Iwamatsu
Nobuhiro Iwamatsu
1 parent
858e8977eb
sh: Divided macro for zImage and add asm/zimage.h
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Showing 2 changed files with 45 additions and 16 deletions Side-by-side Diff
arch/sh/include/asm/zimage.h
| 1 | +/* | |
| 2 | + * (C) Copyright 2010 | |
| 3 | + * Renesas Solutions Corp. | |
| 4 | + * Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | |
| 5 | + * | |
| 6 | + * See file CREDITS for list of people who contributed to this | |
| 7 | + * project. | |
| 8 | + * | |
| 9 | + * This program is free software; you can redistribute it and/or | |
| 10 | + * modify it under the terms of the GNU General Public License as | |
| 11 | + * published by the Free Software Foundation; either version 2 of | |
| 12 | + * the License, or (at your option) any later version. | |
| 13 | + * | |
| 14 | + * This program is distributed in the hope that it will be useful, | |
| 15 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 | + * GNU General Public License for more details. | |
| 18 | + * | |
| 19 | + * You should have received a copy of the GNU General Public License | |
| 20 | + * along with this program; if not, write to the Free Software | |
| 21 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | |
| 22 | + * MA 02111-1307 USA | |
| 23 | + */ | |
| 24 | + | |
| 25 | +#ifndef _ASM_ZIMAGE_H_ | |
| 26 | +#define _ASM_ZIMAGE_H_ | |
| 27 | + | |
| 28 | +#define MOUNT_ROOT_RDONLY 0x000 | |
| 29 | +#define RAMDISK_FLAGS 0x004 | |
| 30 | +#define ORIG_ROOT_DEV 0x008 | |
| 31 | +#define LOADER_TYPE 0x00c | |
| 32 | +#define INITRD_START 0x010 | |
| 33 | +#define INITRD_SIZE 0x014 | |
| 34 | +#define COMMAND_LINE 0x100 | |
| 35 | + | |
| 36 | +#define RD_PROMPT (1<<15) | |
| 37 | +#define RD_DOLOAD (1<<14) | |
| 38 | +#define CMD_ARG_RD_PROMPT "prompt_ramdisk=" | |
| 39 | +#define CMD_ARG_RD_DOLOAD "load_ramdisk=" | |
| 40 | + | |
| 41 | +#endif |
arch/sh/lib/bootm.c
| ... | ... | @@ -27,6 +27,7 @@ |
| 27 | 27 | #include <common.h> |
| 28 | 28 | #include <command.h> |
| 29 | 29 | #include <asm/byteorder.h> |
| 30 | +#include <asm/zimage.h> | |
| 30 | 31 | |
| 31 | 32 | #ifdef CONFIG_SYS_DEBUG |
| 32 | 33 | static void hexdump(unsigned char *buf, int len) |
| ... | ... | @@ -43,19 +44,6 @@ |
| 43 | 44 | } |
| 44 | 45 | #endif |
| 45 | 46 | |
| 46 | -#define MOUNT_ROOT_RDONLY 0x000 | |
| 47 | -#define RAMDISK_FLAGS 0x004 | |
| 48 | -#define ORIG_ROOT_DEV 0x008 | |
| 49 | -#define LOADER_TYPE 0x00c | |
| 50 | -#define INITRD_START 0x010 | |
| 51 | -#define INITRD_SIZE 0x014 | |
| 52 | -#define COMMAND_LINE 0x100 | |
| 53 | - | |
| 54 | -#define RD_PROMPT (1<<15) | |
| 55 | -#define RD_DOLOAD (1<<14) | |
| 56 | -#define CMD_ARG_RD_PROMPT "prompt_ramdisk=" | |
| 57 | -#define CMD_ARG_RD_DOLOAD "load_ramdisk=" | |
| 58 | - | |
| 59 | 47 | #ifdef CONFIG_SH_SDRAM_OFFSET |
| 60 | 48 | #define GET_INITRD_START(initrd, linux) (initrd - linux + CONFIG_SH_SDRAM_OFFSET) |
| 61 | 49 | #else |
| ... | ... | @@ -94,8 +82,8 @@ |
| 94 | 82 | if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) |
| 95 | 83 | return 1; |
| 96 | 84 | |
| 97 | - /* Setup parameters */ | |
| 98 | - memset(param, 0, size); /* Clear zero page */ | |
| 85 | + /* Clear zero page */ | |
| 86 | + memset(param, 0, size); | |
| 99 | 87 | |
| 100 | 88 | /* Set commandline */ |
| 101 | 89 | strcpy(cmdline, bootargs); |
| 102 | 90 | |
| ... | ... | @@ -127,8 +115,8 @@ |
| 127 | 115 | |
| 128 | 116 | /* Boot kernel */ |
| 129 | 117 | kernel(); |
| 130 | - /* does not return */ | |
| 131 | 118 | |
| 119 | + /* does not return */ | |
| 132 | 120 | return 1; |
| 133 | 121 | } |