diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:13:05 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:13:05 +0100 |
| commit | 6e1bbe6e3edf5f508de89114577ce7b7caa89c8a (patch) | |
| tree | 8a95b158fb4103b1db399342a66ba414aa5e82c1 /common | |
| parent | 58bbc77eb0a01033803264539d2c76c242cba210 (diff) | |
| parent | 81b38be8631a0b809c97ab3d929f491373d7314f (diff) | |
| download | u-boot-imx-6e1bbe6e3edf5f508de89114577ce7b7caa89c8a.zip u-boot-imx-6e1bbe6e3edf5f508de89114577ce7b7caa89c8a.tar.gz u-boot-imx-6e1bbe6e3edf5f508de89114577ce7b7caa89c8a.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | common/cmd_ide.c | 4 |
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) { |