diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-13 18:48:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-10-13 18:48:23 +0200 |
| commit | 2885634d648bdc27fcedb623ddf62475e7684e3b (patch) | |
| tree | c3cb5f1e05e4da043731a89cd9c691c94aa757b3 /include | |
| parent | e1893815b0999410d7a327589611c7b38e95299e (diff) | |
| parent | e81a95a9e7cb68ab611e074cd65790015520ea99 (diff) | |
| download | blackbird-obmc-uboot-2885634d648bdc27fcedb623ddf62475e7684e3b.tar.gz blackbird-obmc-uboot-2885634d648bdc27fcedb623ddf62475e7684e3b.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_cmd_all.h | 2 | ||||
| -rw-r--r-- | include/led.h | 45 | ||||
| -rw-r--r-- | include/status_led.h | 21 |
3 files changed, 22 insertions, 46 deletions
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 3d91e99b97..77ea025c09 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -76,6 +76,6 @@ #define CONFIG_CMD_USB /* USB Support */ #define CONFIG_CMD_VFD /* VFD support (TRAB) */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */ -#define CONFIG_CMD_MUX /* AT91 MMC/SPI Mux Support */ +#define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support */ #endif /* _CONFIG_CMD_ALL_H */ diff --git a/include/led.h b/include/led.h deleted file mode 100644 index 57c2b4a377..0000000000 --- a/include/led.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2006 - * Atmel Nordic AB <www.atmel.com> - * Ulf Samuelsson <ulf@atmel.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __LED_H -#define __LED_H - -#ifndef __ASSEMBLY__ -extern void LED_init (void); -extern void red_LED_on(void); -extern void red_LED_off(void); -extern void green_LED_on(void); -extern void green_LED_off(void); -extern void yellow_LED_on(void); -extern void yellow_LED_off(void); -#else - .extern LED_init - .extern red_LED_on - .extern red_LED_off - .extern yellow_LED_on - .extern yellow_LED_off - .extern green_LED_on - .extern green_LED_off -#endif -#endif diff --git a/include/status_led.h b/include/status_led.h index a646814255..74e2147cf9 100644 --- a/include/status_led.h +++ b/include/status_led.h @@ -383,6 +383,27 @@ extern void __led_set (led_id_t mask, int state); # include <asm/status_led.h> #endif +/* + * Coloured LEDs API + */ +#ifndef __ASSEMBLY__ +extern void coloured_LED_init (void); +extern void red_LED_on(void); +extern void red_LED_off(void); +extern void green_LED_on(void); +extern void green_LED_off(void); +extern void yellow_LED_on(void); +extern void yellow_LED_off(void); +#else + .extern LED_init + .extern red_LED_on + .extern red_LED_off + .extern yellow_LED_on + .extern yellow_LED_off + .extern green_LED_on + .extern green_LED_off +#endif + #endif /* CONFIG_STATUS_LED */ #endif /* _STATUS_LED_H_ */ |
