From a7fb5d444512dbc036be166980747b48fb74c164 Mon Sep 17 00:00:00 2001 From: Phil Coval Date: Wed, 16 Jan 2019 13:01:14 +0000 Subject: [PATCH] Merged in rzr/nuttx/sandbox/rzr/review/master (pull request #817) stm32: Align ethernet config name to netnsh nsh-ethernet was only used for stm32f7*-disco, other configurations with network enabled are commonly named netnsh or derived: (eg: nucleo-144/f7670-netnsh) Change-Id: I80a33c8e22fbc7ccc9caf6b483478ae2c3a075ad Signed-off-by: Philippe Coval Approved-by: GregoryN --- configs/stm32f746g-disco/README.txt | 6 +++--- configs/stm32f746g-disco/{nsh-ethernet => netnsh}/defconfig | 0 configs/stm32f769i-disco/{nsh-ethernet => netnsh}/defconfig | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename configs/stm32f746g-disco/{nsh-ethernet => netnsh}/defconfig (100%) rename configs/stm32f769i-disco/{nsh-ethernet => netnsh}/defconfig (100%) diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt index 87aa0c0db33..7a4b099f5bc 100644 --- a/configs/stm32f746g-disco/README.txt +++ b/configs/stm32f746g-disco/README.txt @@ -509,11 +509,11 @@ Configuration Directories built-in applications is enabled, but in the base configuration no built-in applications are selected. - nsh-ethernet - ------------ + netnsh + ------ This configuration is similar to the nsh but a lot more hardware peripherals are enabled, in particular Ethernet, as well as networking - support. It is similar to the stm32f769i-disco/nsh-ethernet + support. It is similar to the stm32f769i-disco/netnsh configuration. This configuration uses USART1 for the serial console. USART1 is connected to the ST-link virtual com inside board.h to remove the need of a extra serial connection to use this board. diff --git a/configs/stm32f746g-disco/nsh-ethernet/defconfig b/configs/stm32f746g-disco/netnsh/defconfig similarity index 100% rename from configs/stm32f746g-disco/nsh-ethernet/defconfig rename to configs/stm32f746g-disco/netnsh/defconfig diff --git a/configs/stm32f769i-disco/nsh-ethernet/defconfig b/configs/stm32f769i-disco/netnsh/defconfig similarity index 100% rename from configs/stm32f769i-disco/nsh-ethernet/defconfig rename to configs/stm32f769i-disco/netnsh/defconfig