summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-03-25 19:29:38 +0000
committerwdenk <wdenk>2004-03-25 19:29:38 +0000
commit0608e04da9d0df5d00cf48a1d9141e2ea1bc9635 (patch)
tree28fa0ea5f1d70d9bae2eaca42643804235141d12 /common
parentb79a11cc2bda7a4d5e00444427a0d06b4e86a990 (diff)
downloadu-boot-imx-0608e04da9d0df5d00cf48a1d9141e2ea1bc9635.zip
u-boot-imx-0608e04da9d0df5d00cf48a1d9141e2ea1bc9635.tar.gz
u-boot-imx-0608e04da9d0df5d00cf48a1d9141e2ea1bc9635.tar.bz2
* Patch by Klaus Heydeck, 13 Mar 2003:
Add support for KUP4X Board
Diffstat (limited to 'common')
-rw-r--r--common/cmd_ide.c8
-rw-r--r--common/cmd_pcmcia.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 842a2fd..aad6127 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -139,7 +139,7 @@ static block_dev_desc_t ide_dev_desc[CFG_IDE_MAXDEVICE];
/* ------------------------------------------------------------------------- */
#ifdef CONFIG_IDE_LED
-#if !defined(CONFIG_KUP4K) && !defined(CONFIG_HMI10)
+#if !defined(CONFIG_KUP4K) && !defined(CONFIG_KUP4X) &&!defined(CONFIG_BMS2003)
static void ide_led (uchar led, uchar status);
#else
extern void ide_led (uchar led, uchar status);
@@ -1537,7 +1537,11 @@ static void ide_reset (void)
/* ------------------------------------------------------------------------- */
-#if defined(CONFIG_IDE_LED) && !defined(CONFIG_AMIGAONEG3SE) && !defined(CONFIG_KUP4K) && !defined(CONFIG_HMI10)
+#if defined(CONFIG_IDE_LED) && \
+ !defined(CONFIG_AMIGAONEG3SE) && \
+ !defined(CONFIG_KUP4K) && \
+ !defined(CONFIG_KUP4X) && \
+ !defined(CONFIG_HMI10)
static uchar led_buffer = 0; /* Buffer for current LED status */
diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c
index cb4e4c6..963f98f 100644
--- a/common/cmd_pcmcia.c
+++ b/common/cmd_pcmcia.c
@@ -2125,11 +2125,11 @@ done:
#endif /* R360MPI */
/* -------------------------------------------------------------------- */
-/* KUP4K Board */
+/* KUP4K and KUP4X Boards */
/* -------------------------------------------------------------------- */
-#if defined(CONFIG_KUP4K)
+#if defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X)
-#define PCMCIA_BOARD_MSG "KUP4K"
+#define PCMCIA_BOARD_MSG "KUP"
#define KUP4K_PCMCIA_B_3V3 (0x00020000)
@@ -2337,7 +2337,7 @@ static int voltage_set(int slot, int vcc, int vpp)
return (0);
}
-#endif /* KUP4K */
+#endif /* KUP4K || KUP4X */
/* -------------------------------------------------------------------- */