Merge branch 'master' into from_upstream

Conflicts:
	src/jtag/drivers/remote_bitbang.c
	src/rtos/rtos_standard_stackings.c
	src/rtos/rtos_standard_stackings.h
	src/target/breakpoints.c
	src/target/riscv/riscv.c
	src/target/target.c

Change-Id: Ia6fcba3d43be8ea31728f3bcc2be6cb7e3ccc5c5

4 files changed, 215 insertions, 15 deletions

diff --git a/src/helper/command.c b/src/helper/command.c
index e5529d9..7c29f73 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -718,16 +718,18 @@ static int jim_find(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return JIM_OK;
 }
 
-COMMAND_HANDLER(jim_echo)
+COMMAND_HANDLER(handle_echo)
 {
 	if (CMD_ARGC == 2 && !strcmp(CMD_ARGV[0], "-n")) {
 		LOG_USER_N("%s", CMD_ARGV[1]);
-		return JIM_OK;
+		return ERROR_OK;
 	}
+
 	if (CMD_ARGC != 1)
-		return JIM_ERR;
+		return ERROR_FAIL;
+
 	LOG_USER("%s", CMD_ARGV[0]);
-	return JIM_OK;
+	return ERROR_OK;
 }
 
 /* Capture progress output and return as tcl return value. If the
@@ -1219,7 +1221,7 @@ static const struct command_registration command_builtin_handlers[] = {
 	},
 	{
 		.name = "echo",
-		.handler = jim_echo,
+		.handler = handle_echo,
 		.mode = COMMAND_ANY,
 		.help = "Logs a message at \"user\" priority. "
 			"Option \"-n\" suppresses trailing newline",
diff --git a/src/helper/command.h b/src/helper/command.h
index f387019..fb9e50c 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -24,8 +24,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <jim-nvp.h>
 
+#include <helper/jim-nvp.h>
 #include <helper/list.h>
 #include <helper/types.h>
 
diff --git a/src/helper/jep106.inc b/src/helper/jep106.inc
index df93a5c..ccf65f7 100644
--- a/src/helper/jep106.inc
+++ b/src/helper/jep106.inc
@@ -27,7 +27,7 @@
 [0][0x15 - 1] = "NXP (Philips)",
 [0][0x16 - 1] = "Synertek",
 [0][0x17 - 1] = "Texas Instruments",
-[0][0x18 - 1] = "Toshiba",
+[0][0x18 - 1] = "Kioxia Corporation",
 [0][0x19 - 1] = "Xicor",
 [0][0x1a - 1] = "Zilog",
 [0][0x1b - 1] = "Eurotechnique",
@@ -44,7 +44,7 @@
 [0][0x26 - 1] = "Visic",
 [0][0x27 - 1] = "Intl. CMOS Technology",
 [0][0x28 - 1] = "SSSI",
-[0][0x29 - 1] = "MicrochipTechnology",
+[0][0x29 - 1] = "Microchip Technology",
 [0][0x2a - 1] = "Ricoh Ltd",
 [0][0x2b - 1] = "VLSI",
 [0][0x2c - 1] = "Micron Technology",
@@ -85,7 +85,7 @@
 [0][0x4f - 1] = "I3 Design System",
 [0][0x50 - 1] = "Klic",
 [0][0x51 - 1] = "Crosspoint Solutions",
-[0][0x52 - 1] = "Alliance Semiconductor",
+[0][0x52 - 1] = "Alliance Memory Inc",
 [0][0x53 - 1] = "Tandem",
 [0][0x54 - 1] = "Hewlett-Packard",
 [0][0x55 - 1] = "Integrated Silicon Solutions",
@@ -1016,7 +1016,7 @@
 [8][0x03 - 1] = "Fairchild",
 [8][0x04 - 1] = "Mercury Systems",
 [8][0x05 - 1] = "Sonics Inc",
-[8][0x06 - 1] = "ICC Intelligent Platforms GmbH",
+[8][0x06 - 1] = "Emerson Automation Solutions",
 [8][0x07 - 1] = "Shenzhen Jinge Information Co Ltd",
 [8][0x08 - 1] = "SCWW",
 [8][0x09 - 1] = "Silicon Motion Inc",
@@ -1047,7 +1047,7 @@
 [8][0x22 - 1] = "TSP Global Co Ltd",
 [8][0x23 - 1] = "HighX",
 [8][0x24 - 1] = "Shenzhen Elicks Technology",
-[8][0x25 - 1] = "ISSI/Chingis",
+[8][0x25 - 1] = "XinKai/Silicon Kaiser",
 [8][0x26 - 1] = "Google Inc",
 [8][0x27 - 1] = "Dasima International Development",
 [8][0x28 - 1] = "Leahkinn Technology Limited",
@@ -1279,7 +1279,7 @@
 [10][0x0e - 1] = "AITC Memory",
 [10][0x0f - 1] = "UNIC Memory Technology Co Ltd",
 [10][0x10 - 1] = "Shenzhen Huafeng Science Technology",
-[10][0x11 - 1] = "ChangXin Memory Technologies Inc",
+[10][0x11 - 1] = "CXMT",
 [10][0x12 - 1] = "Guangzhou Xinyi Heng Computer Trading Firm",
 [10][0x13 - 1] = "SambaNova Systems",
 [10][0x14 - 1] = "V-GEN",
@@ -1333,11 +1333,11 @@
 [10][0x44 - 1] = "UPMEM",
 [10][0x45 - 1] = "Chun Well Technology Holding Limited",
 [10][0x46 - 1] = "Astera Labs Inc",
-[10][0x47 - 1] = "VMEMORY Co Ltd",
+[10][0x47 - 1] = "Winconway",
 [10][0x48 - 1] = "Advantech Co Ltd",
 [10][0x49 - 1] = "Chengdu Fengcai Electronic Technology",
 [10][0x4a - 1] = "The Boeing Company",
-[10][0x4b - 1] = "ThinCI Inc",
+[10][0x4b - 1] = "Blaize Inc",
 [10][0x4c - 1] = "Ramonster Technology Co Ltd",
 [10][0x4d - 1] = "Wuhan Naonongmai Technology Co Ltd",
 [10][0x4e - 1] = "Shenzhen Hui ShingTong Technology",
@@ -1412,4 +1412,202 @@
 [11][0x15 - 1] = "Jazer",
 [11][0x16 - 1] = "Xiamen Semiconductor Investment Group",
 [11][0x17 - 1] = "Guangzhou Longdao Network Tech Co",
+[11][0x18 - 1] = "Shenzhen Futian SEC Electronic Market",
+[11][0x19 - 1] = "Allegro Microsystems LLC",
+[11][0x1a - 1] = "Hunan RunCore Innovation Technology",
+[11][0x1b - 1] = "C-Corsa Technology",
+[11][0x1c - 1] = "Zhuhai Chuangfeixin Technology Co Ltd",
+[11][0x1d - 1] = "Beijing InnoMem Technologies Co Ltd",
+[11][0x1e - 1] = "YooTin",
+[11][0x1f - 1] = "Shenzhen Pengxiong Technology Co Ltd",
+[11][0x20 - 1] = "Dongguan Yingbang Commercial Trading Co",
+[11][0x21 - 1] = "Shenzhen Ronisys Electronics Co Ltd",
+[11][0x22 - 1] = "Hongkong Xinlan Guangke Co Ltd",
+[11][0x23 - 1] = "Apex Microelectronics Co Ltd",
+[11][0x24 - 1] = "Beijing Hongda Jinming Technology Co Ltd",
+[11][0x25 - 1] = "Ling Rui Technology (Shenzhen) Co Ltd",
+[11][0x26 - 1] = "Hongkong Hyunion Electronics Co Ltd",
+[11][0x27 - 1] = "Starsystems Inc",
+[11][0x28 - 1] = "Shenzhen Yingjiaxun Industrial Co Ltd",
+[11][0x29 - 1] = "Dongguan Crown Code Electronic Commerce",
+[11][0x2a - 1] = "Monolithic Power Systems Inc",
+[11][0x2b - 1] = "WuHan SenNaiBo E-Commerce Co Ltd",
+[11][0x2c - 1] = "Hangzhou Hikstorage Technology Co",
+[11][0x2d - 1] = "Shenzhen Goodix Technology Co Ltd",
+[11][0x2e - 1] = "Aigo Electronic Technology Co Ltd",
+[11][0x2f - 1] = "Hefei Konsemi Storage Technology Co Ltd",
+[11][0x30 - 1] = "Cactus Technologies Limited",
+[11][0x31 - 1] = "DSIN",
+[11][0x32 - 1] = "Blu Wireless Technology",
+[11][0x33 - 1] = "Nanjing UCUN Technology Inc",
+[11][0x34 - 1] = "Acacia Communications",
+[11][0x35 - 1] = "Beijinjinshengyihe Technology Co Ltd",
+[11][0x36 - 1] = "Zyzyx",
+[11][0x37 - 1] = "T-HEAD Semiconductor Co Ltd",
+[11][0x38 - 1] = "Shenzhen Hystou Technology Co Ltd",
+[11][0x39 - 1] = "Syzexion",
+[11][0x3a - 1] = "Kembona",
+[11][0x3b - 1] = "Qingdao Thunderobot Technology Co Ltd",
+[11][0x3c - 1] = "Morse Micro",
+[11][0x3d - 1] = "Shenzhen Envida Technology Co Ltd",
+[11][0x3e - 1] = "UDStore Solution Limited",
+[11][0x3f - 1] = "Shunlie",
+[11][0x40 - 1] = "Shenzhen Xin Hong Rui Tech Ltd",
+[11][0x41 - 1] = "Shenzhen Yze Technology Co Ltd",
+[11][0x42 - 1] = "Shenzhen Huang Pu He Xin Technology",
+[11][0x43 - 1] = "Xiamen Pengpai Microelectronics Co Ltd",
+[11][0x44 - 1] = "JISHUN",
+[11][0x45 - 1] = "Shenzhen WODPOSIT Technology Co",
+[11][0x46 - 1] = "Unistar",
+[11][0x47 - 1] = "UNICORE Electronic (Suzhou) Co Ltd",
+[11][0x48 - 1] = "Axonne Inc",
+[11][0x49 - 1] = "Shenzhen SOVERECA Technology Co",
+[11][0x4a - 1] = "Dire Wolf",
+[11][0x4b - 1] = "Whampoa Core Technology Co Ltd",
+[11][0x4c - 1] = "CSI Halbleiter GmbH",
+[11][0x4d - 1] = "ONE Semiconductor",
+[11][0x4e - 1] = "SimpleMachines Inc",
+[11][0x4f - 1] = "Shenzhen Chengyi Qingdian Electronic",
+[11][0x50 - 1] = "Shenzhen Xinlianxin Network Technology",
+[11][0x51 - 1] = "Vayyar Imaging Ltd",
+[11][0x52 - 1] = "Paisen Network Technology Co Ltd",
+[11][0x53 - 1] = "Shenzhen Fengwensi Technology Co Ltd",
+[11][0x54 - 1] = "Caplink Technology Limited",
+[11][0x55 - 1] = "JJT Solution Co Ltd",
+[11][0x56 - 1] = "HOSIN Global Electronics Co Ltd",
+[11][0x57 - 1] = "Shenzhen KingDisk Century Technology",
+[11][0x58 - 1] = "SOYO",
+[11][0x59 - 1] = "DIT Technology Co Ltd",
+[11][0x5a - 1] = "iFound",
+[11][0x5b - 1] = "Aril Computer Company",
+[11][0x5c - 1] = "ASUS",
+[11][0x5d - 1] = "Shenzhen Ruiyingtong Technology Co",
+[11][0x5e - 1] = "HANA Micron",
+[11][0x5f - 1] = "RANSOR",
+[11][0x60 - 1] = "Axiado Corporation",
+[11][0x61 - 1] = "Tesla Corporation",
+[11][0x62 - 1] = "Pingtouge (Shanghai) Semiconductor Co",
+[11][0x63 - 1] = "S3Plus Technologies SA",
+[11][0x64 - 1] = "Integrated Silicon Solution Israel Ltd",
+[11][0x65 - 1] = "GreenWaves Technologies",
+[11][0x66 - 1] = "NUVIA Inc",
+[11][0x67 - 1] = "Guangzhou Shuvrwine Technology Co",
+[11][0x68 - 1] = "Shenzhen Hangshun Chip Technology",
+[11][0x69 - 1] = "Chengboliwei Electronic Business",
+[11][0x6a - 1] = "Kowin Memory Technology Co Ltd",
+[11][0x6b - 1] = "Euronet Technology Inc",
+[11][0x6c - 1] = "SCY",
+[11][0x6d - 1] = "Shenzhen Xinhongyusheng Electrical",
+[11][0x6e - 1] = "PICOCOM",
+[11][0x6f - 1] = "Shenzhen Toooogo Memory Technology",
+[11][0x70 - 1] = "VLSI Solution",
+[11][0x71 - 1] = "Costar Electronics Inc",
+[11][0x72 - 1] = "Shenzhen Huatop Technology Co Ltd",
+[11][0x73 - 1] = "Inspur Electronic Information Industry",
+[11][0x74 - 1] = "Shenzhen Boyuan Computer Technology",
+[11][0x75 - 1] = "Beijing Welldisk Electronics Co Ltd",
+[11][0x76 - 1] = "Suzhou EP Semicon Co Ltd",
+[11][0x77 - 1] = "Zhejiang Dahua Memory Technology",
+[11][0x78 - 1] = "Virtu Financial",
+[11][0x79 - 1] = "Datotek International Co Ltd",
+[11][0x7a - 1] = "Telecom and Microelectronics Industries",
+[11][0x7b - 1] = "Echow Technology Ltd",
+[11][0x7c - 1] = "APEX-INFO",
+[11][0x7d - 1] = "Yingpark",
+[11][0x7e - 1] = "Shenzhen Bigway Tech Co Ltd",
+[12][0x01 - 1] = "Beijing Haawking Technology Co Ltd",
+[12][0x02 - 1] = "Open HW Group",
+[12][0x03 - 1] = "JHICC",
+[12][0x04 - 1] = "ncoder AG",
+[12][0x05 - 1] = "ThinkTech Information Technology Co",
+[12][0x06 - 1] = "Shenzhen Chixingzhe Technology Co Ltd",
+[12][0x07 - 1] = "Biao Ram Technology Co Ltd",
+[12][0x08 - 1] = "Shenzhen Kaizhuoyue Electronics Co Ltd",
+[12][0x09 - 1] = "Shenzhen YC Storage Technology Co Ltd",
+[12][0x0a - 1] = "Shenzhen Chixingzhe Technology Co",
+[12][0x0b - 1] = "Wink Semiconductor (Shenzhen) Co Ltd",
+[12][0x0c - 1] = "AISTOR",
+[12][0x0d - 1] = "Palma Ceia SemiDesign",
+[12][0x0e - 1] = "EM Microelectronic-Marin SA",
+[12][0x0f - 1] = "Shenzhen Monarch Memory Technology",
+[12][0x10 - 1] = "Reliance Memory Inc",
+[12][0x11 - 1] = "Jesis",
+[12][0x12 - 1] = "Espressif Systems (Shanghai) Co Ltd",
+[12][0x13 - 1] = "Shenzhen Sati Smart Technology Co Ltd",
+[12][0x14 - 1] = "NeuMem Co Ltd",
+[12][0x15 - 1] = "Lifelong",
+[12][0x16 - 1] = "Beijing Oitech Technology Co Ltd",
+[12][0x17 - 1] = "Groupe LDLC",
+[12][0x18 - 1] = "Semidynamics Technology Services SLU",
+[12][0x19 - 1] = "swordbill",
+[12][0x1a - 1] = "YIREN",
+[12][0x1b - 1] = "Shenzhen Yinxiang Technology Co Ltd",
+[12][0x1c - 1] = "PoweV Electronic Technology Co Ltd",
+[12][0x1d - 1] = "LEORICE",
+[12][0x1e - 1] = "Waymo LLC",
+[12][0x1f - 1] = "Ventana Micro Systems",
+[12][0x20 - 1] = "Hefei Guangxin Microelectronics Co Ltd",
+[12][0x21 - 1] = "Shenzhen Sooner Industrial Co Ltd",
+[12][0x22 - 1] = "Horizon Robotics",
+[12][0x23 - 1] = "Tangem AG",
+[12][0x24 - 1] = "FuturePath Technology (Shenzhen) Co",
+[12][0x25 - 1] = "RC Module",
+[12][0x26 - 1] = "Team Research Inc",
+[12][0x27 - 1] = "ICMAX Technologies Co Limited",
+[12][0x28 - 1] = "Lynxi Technologies Ltd Co",
+[12][0x29 - 1] = "Guangzhou Taisupanke Computer Equipment",
+[12][0x2a - 1] = "Ceremorphic Inc",
+[12][0x2b - 1] = "Biwin Storage Technology Co Ltd",
+[12][0x2c - 1] = "Beijing ESWIN Computing Technology",
+[12][0x2d - 1] = "WeForce Co Ltd",
+[12][0x2e - 1] = "Shenzhen Fanxiang Information Technology",
+[12][0x2f - 1] = "Unisoc",
+[12][0x30 - 1] = "YingChu",
+[12][0x31 - 1] = "GUANCUN",
+[12][0x32 - 1] = "IPASON",
+[12][0x33 - 1] = "Ayar Labs",
+[12][0x34 - 1] = "Amazon",
+[12][0x35 - 1] = "Shenzhen Xinxinshun Technology Co",
+[12][0x36 - 1] = "Galois Inc",
+[12][0x37 - 1] = "Ubilite Inc",
+[12][0x38 - 1] = "Shenzhen Quanzing Technology Co Ltd",
+[12][0x39 - 1] = "Group RZX Technology LTDA",
+[12][0x3a - 1] = "Yottac Technology (XI'AN) Cooperation",
+[12][0x3b - 1] = "Shenzhen RuiRen Technology Co Ltd",
+[12][0x3c - 1] = "Group Star Technology Co Ltd",
+[12][0x3d - 1] = "RWA (Hong Kong) Ltd",
+[12][0x3e - 1] = "Genesys Logic Inc",
+[12][0x3f - 1] = "T3 Robotics Inc.",
+[12][0x40 - 1] = "Biostar Microtech International Corp",
+[12][0x41 - 1] = "Shenzhen SXmicro Technology Co Ltd",
+[12][0x42 - 1] = "Shanghai Yili Computer Technology Co",
+[12][0x43 - 1] = "Zhixin Semicoducotor Co Ltd",
+[12][0x44 - 1] = "uFound",
+[12][0x45 - 1] = "Aigo Data Security Technology Co. Ltd",
+[12][0x46 - 1] = ".GXore Technologies",
+[12][0x47 - 1] = "Shenzhen Pradeon Intelligent Technology",
+[12][0x48 - 1] = "Power LSI",
+[12][0x49 - 1] = "PRIME",
+[12][0x4a - 1] = "Shenzhen Juyang Innovative Technology",
+[12][0x4b - 1] = "CERVO",
+[12][0x4c - 1] = "SiEngine Technology Co., Ltd.",
+[12][0x4d - 1] = "Beijing Unigroup Tsingteng MicroSystem",
+[12][0x4e - 1] = "Brainsao GmbH",
+[12][0x4f - 1] = "Credo Technology Group Ltd",
+[12][0x50 - 1] = "Shanghai Biren Technology Co Ltd",
+[12][0x51 - 1] = "Nucleu Semiconductor",
+[12][0x52 - 1] = "Shenzhen Guangshuo Electronics Co Ltd",
+[12][0x53 - 1] = "ZhongsihangTechnology Co Ltd",
+[12][0x54 - 1] = "Suzhou Mainshine Electronic Co Ltd.",
+[12][0x55 - 1] = "Guangzhou Riss Electronic Technology",
+[12][0x56 - 1] = "Shenzhen Cloud Security Storage Co",
+[12][0x57 - 1] = "ROG",
+[12][0x58 - 1] = "Perceive",
+[12][0x59 - 1] = "e-peas",
+[12][0x5a - 1] = "Fraunhofer IPMS",
+[12][0x5b - 1] = "Shenzhen Daxinlang Electronic Tech Co",
+[12][0x5c - 1] = "Abacus Peripherals Private Limited",
+[12][0x5d - 1] = "OLOy Technology",
+[12][0x5e - 1] = "Wuhan P&S Semiconductor Co Ltd",
+[12][0x5f - 1] = "Sitrus Technology",
 /* EOF */
diff --git a/src/helper/jim-nvp.c b/src/helper/jim-nvp.c
index e21bc68..738ed79 100644
--- a/src/helper/jim-nvp.c
+++ b/src/helper/jim-nvp.c
@@ -41,8 +41,8 @@
  * official policies, either expressed or implied, of the Jim Tcl Project.
  */
 
+#include "jim-nvp.h"
 #include <string.h>
-#include <jim-nvp.h>
 
 int jim_get_nvp(Jim_Interp *interp,
 	Jim_Obj *objptr, const struct jim_nvp *nvp_table, const struct jim_nvp **result)