Commit db71964235c1dfa13ec398da483b0bdbbf31d5b7
1 parent
4f63bfb689
Exists in
master
and in
54 other branches
nios2: remove asm/status_led.h
The file has a wrong inline keyword of __led_toggle(), which causes compilation error. And its content is defined in common status_led.h. So define CONFIG_BOARD_SPECIFIC_LED in board config files and remove this header file. Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Showing 4 changed files with 2 additions and 34 deletions Side-by-side Diff
arch/nios2/include/asm/status_led.h
| 1 | -/* | |
| 2 | - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> | |
| 3 | - * Scott McNutt <smcnutt@psyent.com> | |
| 4 | - * | |
| 5 | - * See file CREDITS for list of people who contributed to this | |
| 6 | - * project. | |
| 7 | - * | |
| 8 | - * This program is free software; you can redistribute it and/or | |
| 9 | - * modify it under the terms of the GNU General Public License as | |
| 10 | - * published by the Free Software Foundation; either version 2 of | |
| 11 | - * the License, or (at your option) any later version. | |
| 12 | - * | |
| 13 | - * This program is distributed in the hope that it will be useful, | |
| 14 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | - * GNU General Public License for more details. | |
| 17 | - * | |
| 18 | - * You should have received a copy of the GNU General Public License | |
| 19 | - * along with this program; if not, write to the Free Software | |
| 20 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | |
| 21 | - * MA 02111-1307 USA | |
| 22 | - */ | |
| 23 | -#ifndef __ASM_STATUS_LED_H__ | |
| 24 | -#define __ASM_STATUS_LED_H__ | |
| 25 | - | |
| 26 | -typedef unsigned led_id_t; | |
| 27 | -extern void __led_init (led_id_t mask, int state); | |
| 28 | -extern void __led_set (led_id_t mask, int state); | |
| 29 | -inline void __led_toggle (led_id_t mask); | |
| 30 | - | |
| 31 | -#endif /* __ASM_STATUS_LED_H__ */ |
include/configs/PK1C20.h
| ... | ... | @@ -142,6 +142,7 @@ |
| 142 | 142 | *----------------------------------------------------------------------*/ |
| 143 | 143 | #define CONFIG_SYS_LEDPIO_ADDR 0x02120870 /* LED PIO base addr */ |
| 144 | 144 | #define CONFIG_STATUS_LED /* Enable status driver */ |
| 145 | +#define CONFIG_BOARD_SPECIFIC_LED | |
| 145 | 146 | |
| 146 | 147 | #define STATUS_LED_BIT 1 /* Bit-0 on PIO */ |
| 147 | 148 | #define STATUS_LED_STATE 1 /* Blinking */ |
include/configs/nios2-generic.h
| ... | ... | @@ -68,6 +68,7 @@ |
| 68 | 68 | #define CONFIG_SYS_ALTERA_PIO_GPIO_NUM LED_PIO_WIDTH |
| 69 | 69 | |
| 70 | 70 | #define CONFIG_STATUS_LED /* Enable status driver */ |
| 71 | +#define CONFIG_BOARD_SPECIFIC_LED | |
| 71 | 72 | #define CONFIG_GPIO_LED /* Enable GPIO LED driver */ |
| 72 | 73 | #define CONFIG_GPIO /* Enable GPIO driver */ |
| 73 | 74 |
include/status_led.h
| ... | ... | @@ -273,9 +273,6 @@ |
| 273 | 273 | #elif defined(CONFIG_STXXTC) |
| 274 | 274 | /* XXX empty just to avoid the error */ |
| 275 | 275 | /************************************************************************/ |
| 276 | -#elif defined(CONFIG_NIOS2) | |
| 277 | -/* XXX empty just to avoid the error */ | |
| 278 | -/************************************************************************/ | |
| 279 | 276 | #elif defined(CONFIG_V38B) |
| 280 | 277 | |
| 281 | 278 | # define STATUS_LED_BIT 0x0010 /* Timer7 GPIO */ |