From 7f2d559b75d8fe275799c76bfb348990032e3e67 Mon Sep 17 00:00:00 2001
From: Watson Zeng <zhiwei@synopsys.com>
Date: Fri, 28 Feb 2020 10:53:06 +0800
Subject: [PATCH] [bsp][synopsys] fix the PKG_EMBAC_BSP_PATH

the embARC_BSP package in env packages is changed
frome system to peripheral folder, this change should also to be fixed in the config files correspondingly.

Signed-off-by: Watson Zeng <zhiwei@synopsys.com>
---
 bsp/synopsys/boards/.config    | 17 +++++++++++------
 bsp/synopsys/boards/rtconfig.h |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bsp/synopsys/boards/.config b/bsp/synopsys/boards/.config
index 6ae650f8cc..e39ee4aa65 100644
--- a/bsp/synopsys/boards/.config
+++ b/bsp/synopsys/boards/.config
@@ -68,7 +68,7 @@ CONFIG_RT_USING_DEVICE=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
-CONFIG_RT_VER_NUM=0x40002
+CONFIG_RT_VER_NUM=0x40003
 CONFIG_RT_USING_CPU_FFS=y
 # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
 
@@ -201,6 +201,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=1024
 # CONFIG_PKG_USING_WEBNET is not set
 # CONFIG_PKG_USING_MONGOOSE is not set
 # CONFIG_PKG_USING_MYMQTT is not set
+# CONFIG_PKG_USING_MQTTCLIENT is not set
 # CONFIG_PKG_USING_WEBTERMINAL is not set
 # CONFIG_PKG_USING_CJSON is not set
 # CONFIG_PKG_USING_JSMN is not set
@@ -258,6 +259,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=1024
 # CONFIG_PKG_USING_ABUP_FOTA is not set
 # CONFIG_PKG_USING_LIBCURL2RTT is not set
 # CONFIG_PKG_USING_CAPNP is not set
+# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
 
 #
 # security packages
@@ -265,6 +267,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=1024
 # CONFIG_PKG_USING_MBEDTLS is not set
 # CONFIG_PKG_USING_libsodium is not set
 # CONFIG_PKG_USING_TINYCRYPT is not set
+# CONFIG_PKG_USING_TFM is not set
 
 #
 # language packages
@@ -318,11 +321,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=1024
 # CONFIG_PKG_USING_THREAD_POOL is not set
 # CONFIG_PKG_USING_ROBOTS is not set
 # CONFIG_PKG_USING_EV is not set
-CONFIG_PKG_USING_EMBARC_BSP=y
-CONFIG_PKG_EMBARC_BSP_PATH="/packages/system/embARC_bsp"
-CONFIG_PKG_USING_EMBARC_BSP_UPSTREAM_VERSION=y
-# CONFIG_PKG_USING_EMBARC_BSP_MASTER_VERSION is not set
-CONFIG_PKG_EMBARC_BSP_VER="upstream"
+# CONFIG_PKG_USING_SYSWATCH is not set
 
 #
 # peripheral libraries and drivers
@@ -339,6 +338,7 @@ CONFIG_PKG_EMBARC_BSP_VER="upstream"
 # CONFIG_PKG_USING_SX12XX is not set
 # CONFIG_PKG_USING_SIGNAL_LED is not set
 # CONFIG_PKG_USING_LEDBLINK is not set
+# CONFIG_PKG_USING_LITTLED is not set
 # CONFIG_PKG_USING_WM_LIBRARIES is not set
 # CONFIG_PKG_USING_KENDRYTE_SDK is not set
 # CONFIG_PKG_USING_INFRARED is not set
@@ -356,6 +356,11 @@ CONFIG_PKG_EMBARC_BSP_VER="upstream"
 # CONFIG_PKG_USING_RPLIDAR is not set
 # CONFIG_PKG_USING_AS608 is not set
 # CONFIG_PKG_USING_RC522 is not set
+CONFIG_PKG_USING_EMBARC_BSP=y
+CONFIG_PKG_EMBARC_BSP_PATH="/packages/peripherals/embARC_bsp"
+CONFIG_PKG_USING_EMBARC_BSP_UPSTREAM_VERSION=y
+# CONFIG_PKG_USING_EMBARC_BSP_MASTER_VERSION is not set
+CONFIG_PKG_EMBARC_BSP_VER="upstream"
 
 #
 # miscellaneous packages
diff --git a/bsp/synopsys/boards/rtconfig.h b/bsp/synopsys/boards/rtconfig.h
index 6df6176c16..febcf8103b 100644
--- a/bsp/synopsys/boards/rtconfig.h
+++ b/bsp/synopsys/boards/rtconfig.h
@@ -45,7 +45,7 @@
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uart1"
-#define RT_VER_NUM 0x40002
+#define RT_VER_NUM 0x40003
 #define RT_USING_CPU_FFS
 
 /* RT-Thread Components */
@@ -139,11 +139,11 @@
 
 /* system packages */
 
-#define PKG_USING_EMBARC_BSP
-#define PKG_USING_EMBARC_BSP_UPSTREAM_VERSION
 
 /* peripheral libraries and drivers */
 
+#define PKG_USING_EMBARC_BSP
+#define PKG_USING_EMBARC_BSP_UPSTREAM_VERSION
 
 /* miscellaneous packages */