summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-12-27 01:12:56 +0100
committerWolfgang Denk <wd@denx.de>2007-12-27 01:12:56 +0100
commit81b38be8631a0b809c97ab3d929f491373d7314f (patch)
tree0dd6444e2b602dcd06524f57c234b1f3b18ceb83 /common
parentf77ac3d657e9b1d40012153e872a2118cca10a3d (diff)
parent29592ecba3b932b9b152bcec6c0c0806412db4a3 (diff)
downloadu-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')
-rw-r--r--common/cmd_bootm.c2
-rw-r--r--common/cmd_ide.c4
2 files changed, 4 insertions, 2 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
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 821dcff..c38be4f 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -886,7 +886,7 @@ input_swap_data(int dev, ulong *sect_buf, int words)
#endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */
-#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH)
static void
output_data(int dev, ulong *sect_buf, int words)
{
@@ -938,7 +938,7 @@ output_data(int dev, ulong *sect_buf, int words)
}
#endif /* __PPC__ */
-#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH)
static void
input_data(int dev, ulong *sect_buf, int words)
{