diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:12:56 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:12:56 +0100 |
| commit | 81b38be8631a0b809c97ab3d929f491373d7314f (patch) | |
| tree | 0dd6444e2b602dcd06524f57c234b1f3b18ceb83 /common/cmd_bootm.c | |
| parent | f77ac3d657e9b1d40012153e872a2118cca10a3d (diff) | |
| parent | 29592ecba3b932b9b152bcec6c0c0806412db4a3 (diff) | |
| download | u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.zip u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.tar.gz u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Conflicts:
MAINTAINERS
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index d816349..9546729 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -260,6 +260,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (hdr->ih_arch != IH_CPU_NIOS2) #elif defined(__PPC__) if (hdr->ih_arch != IH_CPU_PPC) +#elif defined(__sh__) + if (hdr->ih_arch != IH_CPU_SH) #else # error Unknown CPU type #endif |