diff options
| -rw-r--r-- | arch/arm/dts/imx23-olinuxino-u-boot.dtsi | 15 | ||||
| -rw-r--r-- | board/olimex/mx23_olinuxino/mx23_olinuxino.c | 7 | ||||
| -rw-r--r-- | configs/mx23_olinuxino_defconfig | 12 | ||||
| -rw-r--r-- | net/bootp.c | 8 |
4 files changed, 23 insertions, 19 deletions
diff --git a/arch/arm/dts/imx23-olinuxino-u-boot.dtsi b/arch/arm/dts/imx23-olinuxino-u-boot.dtsi index dee8433696f..3f2f117b953 100644 --- a/arch/arm/dts/imx23-olinuxino-u-boot.dtsi +++ b/arch/arm/dts/imx23-olinuxino-u-boot.dtsi @@ -1,5 +1,20 @@ // SPDX-License-Identifier: GPL-2.0+ +/ { + leds { + user_led: user { + default-state = "on"; + }; + }; + + options { + u-boot { + compatible = "u-boot,config"; + boot-led = <&user_led>; + }; + }; +}; + &ssp0 { non-removable; }; diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c index b2bb6678c23..78136c1620a 100644 --- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c +++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c @@ -13,9 +13,6 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> -#ifdef CONFIG_LED_STATUS -#include <status_led.h> -#endif #include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; @@ -61,9 +58,5 @@ int board_init(void) /* Adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; -#if defined(CONFIG_LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE) - status_led_set(CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS_STATE); -#endif - return 0; } diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 1da18f31344..3df1c8d007d 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x40000 CONFIG_IMX_CONFIG="" +CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx23-olinuxino" CONFIG_TARGET_MX23_OLINUXINO=y CONFIG_SPL_SERIAL=y @@ -38,14 +39,9 @@ CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="uImage" CONFIG_VERSION_VARIABLE=y CONFIG_MXS_GPIO=y -CONFIG_LED_STATUS=y -CONFIG_LED_STATUS_GPIO=y -CONFIG_LED_STATUS0=y -CONFIG_LED_STATUS_BIT=778 -CONFIG_LED_STATUS_STATE=2 -CONFIG_LED_STATUS_BOOT_ENABLE=y -CONFIG_LED_STATUS_BOOT=0 -CONFIG_LED_STATUS_CMD=y +CONFIG_LED=y +CONFIG_LED_BOOT=y +CONFIG_LED_GPIO=y CONFIG_MMC_MXS=y CONFIG_CONS_INDEX=0 CONFIG_DM_SERIAL=y diff --git a/net/bootp.c b/net/bootp.c index 64fca9a42d9..1d905a01a47 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -19,8 +19,8 @@ #include <linux/delay.h> #include <net/tftp.h> #include "bootp.h" -#ifdef CONFIG_LED_STATUS -#include <status_led.h> +#if IS_ENABLED(CONFIG_LED_BOOT) +#include <led.h> #endif #ifdef CONFIG_BOOTP_RANDOM_DELAY #include "net_rand.h" @@ -396,8 +396,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_LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE) - status_led_set(CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS_OFF); +#if IS_ENABLED(CONFIG_LED_BOOT) + led_boot_off(); #endif store_net_params(bp); /* Store net parameters from reply */ |