This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 92c721a532ab425bf862f7e1adf2edeb8442cab6
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Mon May 11 14:09:57 2020 +0800
boards: Fix the wrong order in some defconfig
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig | 16 ++++++++--------
boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig | 2 +-
.../arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig | 2 +-
boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig | 2 +-
boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig | 2 +-
boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig | 2 +-
boards/arm/stm32/olimexino-stm32/configs/can/defconfig | 2 +-
.../stm32/stm32f334-disco/configs/buckboost/defconfig | 2 +-
boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm32f334-disco/configs/powerled/defconfig | 2 +-
boards/sim/sim/sim/configs/rpproxy/defconfig | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
index 11050e6..ad5fe5a 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
@@ -44,6 +44,14 @@ CONFIG_INPUT_FT5X06=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_LV_HOR_RES=480
+CONFIG_LV_USE_THEME_ALIEN=y
+CONFIG_LV_USE_THEME_DEFAULT=y
+CONFIG_LV_USE_THEME_MATERIAL=y
+CONFIG_LV_USE_THEME_MONO=y
+CONFIG_LV_USE_THEME_NEMO=y
+CONFIG_LV_USE_THEME_NIGHT=y
+CONFIG_LV_USE_THEME_TEMPL=y
+CONFIG_LV_USE_THEME_ZEN=y
CONFIG_LV_VER_RES=272
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
@@ -65,12 +73,4 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_LV_USE_THEME_ALIEN=y
-CONFIG_LV_USE_THEME_DEFAULT=y
-CONFIG_LV_USE_THEME_MATERIAL=y
-CONFIG_LV_USE_THEME_MONO=y
-CONFIG_LV_USE_THEME_NEMO=y
-CONFIG_LV_USE_THEME_NIGHT=y
-CONFIG_LV_USE_THEME_TEMPL=y
-CONFIG_LV_USE_THEME_ZEN=y
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
index 779b04a..492aee2 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
@@ -61,8 +61,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_UMOUNT=y
CONFIG_NSH_DISABLE_UNSET=y
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
index 57198ef..0e286c6 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
@@ -13,8 +13,8 @@
# CONFIG_NXPLAYER_INCLUDE_PREFERRED_DEVICE is not set
# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set
# CONFIG_NX_DISABLE_16BPP is not set
-# CONFIG_STM32_CCMEXCLUDE is not set
# CONFIG_SPI_CALLBACK is not set
+# CONFIG_STM32_CCMEXCLUDE is not set
CONFIG_ARCH="arm"
CONFIG_ARCH_BOARD="mikroe-stm32f4"
CONFIG_ARCH_BOARD_MIKROE_STM32F4=y
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
index d71ef26..814b938 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
@@ -61,8 +61,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
index 6b1d1fd..6395517 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
@@ -64,8 +64,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
index e76d05f..8b3ea98 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
@@ -61,8 +61,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
index 989aeb1..ce8d488 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
@@ -60,7 +60,6 @@ CONFIG_MM_SMALL=y
CONFIG_NAME_MAX=8
CONFIG_NFILE_DESCRIPTORS=5
CONFIG_NFILE_STREAMS=5
-CONFIG_TLS_NELEM=0
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_CODECS_BUFSIZE=0
@@ -112,6 +111,7 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_TIME64=y
CONFIG_TASK_NAME_SIZE=12
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
+CONFIG_TLS_NELEM=0
CONFIG_USART1_RXBUFSIZE=32
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART1_TXBUFSIZE=32
diff --git a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
index 4cda53d..81e36b4 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
@@ -77,8 +77,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
diff --git a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
index 2335b41..18bfacc 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
@@ -63,8 +63,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
index 6264e0e..dafb0d7 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
@@ -69,8 +69,8 @@ CONFIG_NSH_DISABLE_PWD=y
CONFIG_NSH_DISABLE_RM=y
CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_SLEEP=y
+CONFIG_NSH_DISABLE_SOURCE=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig
b/boards/sim/sim/sim/configs/rpproxy/defconfig
index c0f2aa3..c20f1c0 100644
--- a/boards/sim/sim/sim/configs/rpproxy/defconfig
+++ b/boards/sim/sim/sim/configs/rpproxy/defconfig
@@ -24,6 +24,7 @@ CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=176
CONFIG_NETDB_DNSCLIENT_RECV_TIMEOUT=3
CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x771d1d1d
+CONFIG_NETUTILS_USRSOCK_RPMSG=y
CONFIG_NET_ICMP_NO_STACK=y
CONFIG_NET_SOCKOPTS=y
CONFIG_NET_TCP_NO_STACK=y
@@ -32,7 +33,6 @@ CONFIG_NET_USRSOCK=y
CONFIG_NET_USRSOCK_OTHER=y
CONFIG_NET_USRSOCK_TCP=y
CONFIG_NET_USRSOCK_UDP=y
-CONFIG_NETUTILS_USRSOCK_RPMSG=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_PROMPT_STRING="proxy> "
