diff options
| author | Uri Mashiach <uri.mashiach@compulab.co.il> | 2017-01-19 10:51:45 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-21 15:12:33 -0500 |
| commit | 2d8d190c8394b43c0989cdb04a50cb48d4e1f8da (patch) | |
| tree | a19e034f406aba9bfc07e8ef0d4fafc6fa4a04b7 /net | |
| parent | 79267edd10fde0815c382157b9cb280166637fac (diff) | |
status_led: Kconfig migration
Move all of the status LED feature to drivers/led/Kconfig.
The LED status definitions were moved from the board configuration
files to the defconfig files.
TBD: Move all of the definitions in the include/status_led.h to the
relevant board's defconfig files.
Tested boards: CL-SOM-AM57x, CM-T335
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 6 | ||||
| -rw-r--r-- | net/net.c | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/net/bootp.c b/net/bootp.c index 42e14eda417..be8f710e0c5 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -15,7 +15,7 @@ #include <net/tftp.h> #include "bootp.h" #include "nfs.h" -#ifdef CONFIG_STATUS_LED +#ifdef CONFIG_LED_STATUS #include <status_led.h> #endif #ifdef CONFIG_BOOTP_RANDOM_DELAY @@ -359,8 +359,8 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, /* * Got a good BOOTP reply. Copy the data into our variables. */ -#if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) - status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF); +#if defined(CONFIG_LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE) + status_led_set(CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS_OFF); #endif store_net_params(bp); /* Store net parameters from reply */ diff --git a/net/net.c b/net/net.c index 671d45dd83c..6e678770fa9 100644 --- a/net/net.c +++ b/net/net.c @@ -88,7 +88,7 @@ #include <errno.h> #include <net.h> #include <net/tftp.h> -#if defined(CONFIG_STATUS_LED) +#if defined(CONFIG_LED_STATUS) #include <miiphy.h> #include <status_led.h> #endif @@ -518,15 +518,15 @@ restart: #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_SYS_FAULT_ECHO_LINK_DOWN) && \ - defined(CONFIG_STATUS_LED) && \ - defined(STATUS_LED_RED) + defined(CONFIG_LED_STATUS) && \ + defined(CONFIG_LED_STATUS_RED) /* * Echo the inverted link state to the fault LED. */ if (miiphy_link(eth_get_dev()->name, CONFIG_SYS_FAULT_MII_ADDR)) - status_led_set(STATUS_LED_RED, STATUS_LED_OFF); + status_led_set(CONFIG_LED_STATUS_RED, CONFIG_LED_STATUS_OFF); else - status_led_set(STATUS_LED_RED, STATUS_LED_ON); + status_led_set(CONFIG_LED_STATUS_RED, CONFIG_LED_STATUS_ON); #endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */ #endif /* CONFIG_MII, ... */ #ifdef CONFIG_USB_KEYBOARD @@ -583,16 +583,18 @@ restart: #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_SYS_FAULT_ECHO_LINK_DOWN) && \ - defined(CONFIG_STATUS_LED) && \ - defined(STATUS_LED_RED) + defined(CONFIG_LED_STATUS) && \ + defined(CONFIG_LED_STATUS_RED) /* * Echo the inverted link state to the fault LED. */ if (miiphy_link(eth_get_dev()->name, CONFIG_SYS_FAULT_MII_ADDR)) - status_led_set(STATUS_LED_RED, STATUS_LED_OFF); + status_led_set(CONFIG_LED_STATUS_RED, + CONFIG_LED_STATUS_OFF); else - status_led_set(STATUS_LED_RED, STATUS_LED_ON); + status_led_set(CONFIG_LED_STATUS_RED, + CONFIG_LED_STATUS_ON); #endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */ #endif /* CONFIG_MII, ... */ debug_cond(DEBUG_INT_STATE, "--- net_loop timeout\n"); |