summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-12-07 23:55:12 +0000
committerwdenk <wdenk>2003-12-07 23:55:12 +0000
commit9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8 (patch)
treebbb665de89d40b6584076a60f138616fcf373c70 /include
parent3bbc899fc0bba51db83e4b3960f32c3ad6ba813c (diff)
downloadu-boot-imx-9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8.zip
u-boot-imx-9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8.tar.gz
u-boot-imx-9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8.tar.bz2
* Patch by Pierre Aubert, 24 Nov 2003:
- add a return value for the fpga command - add ide_preinit() function called in ide_init if CONFIG_IDE_PREINIT is defined. If ide_preinit fails, ide_init is aborted. - fix an endianess problem in fat.h
Diffstat (limited to 'include')
-rw-r--r--include/ata.h9
-rw-r--r--include/fat.h2
2 files changed, 7 insertions, 4 deletions
diff --git a/include/ata.h b/include/ata.h
index 968b3c4..fa30ee8 100644
--- a/include/ata.h
+++ b/include/ata.h
@@ -37,10 +37,13 @@
* 8-bit (register) and 16-bit (data) accesses might use different
* address spaces. This is implemented by the following definitions.
*/
+#ifndef CFG_ATA_STRIDE
+#define CFG_ATA_STRIDE 1
+#endif
-#define ATA_IO_DATA(x) (CFG_ATA_DATA_OFFSET+(x))
-#define ATA_IO_REG(x) (CFG_ATA_REG_OFFSET +(x))
-#define ATA_IO_ALT(x) (CFG_ATA_ALT_OFFSET +(x))
+#define ATA_IO_DATA(x) (CFG_ATA_DATA_OFFSET+((x) * CFG_ATA_STRIDE))
+#define ATA_IO_REG(x) (CFG_ATA_REG_OFFSET +((x) * CFG_ATA_STRIDE))
+#define ATA_IO_ALT(x) (CFG_ATA_ALT_OFFSET +((x) * CFG_ATA_STRIDE))
/*
* I/O Register Descriptions
diff --git a/include/fat.h b/include/fat.h
index 6f0f40f..3f9c5f3 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -89,7 +89,7 @@
#define FAT2CPU16 le16_to_cpu
#define FAT2CPU32 le32_to_cpu
#else
-#if 1
+#if __LITTLE_ENDIAN
#define FAT2CPU16(x) (x)
#define FAT2CPU32(x) (x)
#else