Merge with rsync://git-user@source.denx.net/git/u-boot.git

[platform/kernel/u-boot.git] / include / status_led.h

diff --git a/include/status_led.h b/include/status_led.h
index 5a33e31..b80780a 100644 (file)
--- a/include/status_led.h
+++ b/include/status_led.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -43,7 +43,7 @@ void status_led_tick (unsigned long timestamp);
 void status_led_set  (int led, int state);
 
 /*****  TQM8xxL  ********************************************************/
-#if defined(CONFIG_TQM8xxL)
+#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_HMI10)
 # define STATUS_LED_PAR                im_cpm.cp_pbpar
 # define STATUS_LED_DIR                im_cpm.cp_pbdir
 # define STATUS_LED_ODR                im_cpm.cp_pbodr
@@ -236,6 +236,8 @@ void status_led_set  (int led, int state);
 /*****  NetVia   ********************************************************/
 #elif defined(CONFIG_NETVIA)
 
+#if !defined(CONFIG_NETVIA_VERSION) || CONFIG_NETVIA_VERSION == 1
+
 #define STATUS_LED_PAR         im_ioport.iop_pdpar
 #define STATUS_LED_DIR         im_ioport.iop_pddir
 #undef  STATUS_LED_ODR
@@ -252,11 +254,12 @@ void status_led_set  (int led, int state);
 # define STATUS_LED_ACTIVE     0               /* LED on for bit == 0  */
 # define STATUS_LED_BOOT       0               /* LED 0 used for boot status */
 
+#endif
 
 /*****  CMI   ********************************************************/
 #elif defined(CONFIG_CMI)
-# define STATUS_LED_DIR                im_mios.mios_mpiosm32ddr 
-# define STATUS_LED_DAT                im_mios.mios_mpiosm32dr 
+# define STATUS_LED_DIR                im_mios.mios_mpiosm32ddr
+# define STATUS_LED_DAT                im_mios.mios_mpiosm32dr
 
 # define STATUS_LED_BIT                0x2000          /* Select one of the 16 possible*/
                                                /* MIOS outputs */
@@ -266,8 +269,8 @@ void status_led_set  (int led, int state);
 # define STATUS_LED_ACTIVE     1               /* LED on for bit == 0  */
 # define STATUS_LED_BOOT       0               /* LED 0 used for boot status */
 
-/*****  KUP4K  ********************************************************/
-#elif defined(CONFIG_KUP4K)
+/*****  KUP4K, KUP4X  ****************************************************/
+#elif defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X) || defined(CONFIG_CCM)
 
 # define STATUS_LED_PAR                im_ioport.iop_papar
 # define STATUS_LED_DIR                im_ioport.iop_padir
@@ -315,6 +318,30 @@ void status_led_set  (int led, int state);
 
 # define STATUS_LED_BOOT        0               /* LED 0 used for boot status */
 
+/*****  HMI10  **********************************************************/
+#elif defined(CONFIG_HMI10)
+# define STATUS_LED_PAR                im_ioport.iop_papar
+# define STATUS_LED_DIR                im_ioport.iop_padir
+# define STATUS_LED_ODR                im_ioport.iop_paodr
+# define STATUS_LED_DAT                im_ioport.iop_padat
+
+# define STATUS_LED_BIT                0x00000001      /* LED is on PA15 */
+# define STATUS_LED_PERIOD     (CFG_HZ / 2)
+# define STATUS_LED_STATE      STATUS_LED_BLINKING
+
+# define STATUS_LED_ACTIVE     1               /* LED on for bit == 1  */
+
+# define STATUS_LED_BOOT       0               /* LED 0 used for boot status */
+
+/*****  NetPhone   ********************************************************/
+#elif defined(CONFIG_NETPHONE) || defined(CONFIG_NETTA2)
+/* XXX empty just to avoid the error */
+/*****  sbc8240   ********************************************************/
+#elif defined(CONFIG_WRSBC8240)
+/* XXX empty just to avoid the error */
+/************************************************************************/
+#elif defined(CONFIG_NIOS2)
+/* XXX empty just to avoid the error */
 /************************************************************************/
 #else
 # error Status LED configuration missing