Skip to content

Commit f3879e6

Browse files
author
Wayne Ren
authored
Merge pull request #79 from foss-for-synopsys-dwc-arc-processors/feature/2018_12_rc2_fix
Feature/2018 12 rc2 fix
2 parents c63986f + f10541b commit f3879e6

File tree

27 files changed

+1110
-62
lines changed

27 files changed

+1110
-62
lines changed

‎board/linker_template_gnu.ld

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,22 @@ SECTIONS
7878
_f_sdata = .;
7979
__SDATA_BEGIN__ = .;
8080
*(.sdata .sdata.* .gnu.linkonce.s.*)
81-
_e_sdata = .;
82-
_e_data = .;
83-
} > REGION_RAM AT > REGION_ROM
84-
85-
.bss (NOLOAD) : ALIGN(8)
86-
{
8781
PROVIDE (__sbss_start = .);
8882
PROVIDE (___sbss_start = .);
89-
_f_bss = .;
9083
_f_sbss = .;
9184
*(.dynsbss)
9285
*(.sbss .sbss.* .gnu.linkonce.sb.*)
9386
*(.scommon)
9487
_e_sbss = .;
9588
PROVIDE (__sbss_end = .);
9689
PROVIDE (___sbss_end = .);
90+
_e_sdata = .;
91+
_e_data = .;
92+
} > REGION_RAM AT > REGION_ROM
9793

94+
.bss (NOLOAD) : ALIGN(8)
95+
{
96+
_f_bss = .;
9897
*(.dynbss)
9998
*(.bss .bss.* .gnu.linkonce.b.*)
10099
*(COMMON)

‎board/linker_template_mw.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ SECTIONS {
6969
_f_data = .;
7070
_f_sdata = .;
7171
*(.sdata)
72+
*(.sbss)
7273
_e_sdata = .;
7374
*(TYPE data)
7475
}

‎example/baremetal/openthread/cli/mbedtls-config.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <openthread/config.h>
3434
#include <openthread/platform/logging.h>
3535
#include <openthread/platform/memory.h>
36+
#include <stdio.h>
3637

3738
#if defined(_WIN32)
3839
#include <stdarg.h>
@@ -189,7 +190,7 @@ __inline int windows_kernel_snprintf(char * s, size_t n, const char * format, ..
189190
//#define MBEDTLS_PLATFORM_TIME_ALT
190191
//#define MBEDTLS_PLATFORM_FPRINTF_ALT
191192
//#define MBEDTLS_PLATFORM_PRINTF_ALT
192-
//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
193+
#define MBEDTLS_PLATFORM_SNPRINTF_ALT
193194
//#define MBEDTLS_PLATFORM_NV_SEED_ALT
194195

195196
/**
@@ -2557,7 +2558,7 @@ __inline int windows_kernel_snprintf(char * s, size_t n, const char * format, ..
25572558
//#define MBEDTLS_PLATFORM_STD_FPRINTF fprintf /**< Default fprintf to use, can be undefined */
25582559
//#define MBEDTLS_PLATFORM_STD_PRINTF printf /**< Default printf to use, can be undefined */
25592560
/* Note: your snprintf must correclty zero-terminate the buffer! */
2560-
//#define MBEDTLS_PLATFORM_STD_SNPRINTF snprintf /**< Default snprintf to use, can be undefined */
2561+
#define MBEDTLS_PLATFORM_STD_SNPRINTF snprintf /**< Default snprintf to use, can be undefined */
25612562
//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS 0 /**< Default exit value to use, can be undefined */
25622563
//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE 1 /**< Default exit value to use, can be undefined */
25632564
//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */

‎example/baremetal/openthread/ncp/mbedtls-config.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <openthread/config.h>
3434
#include <openthread/platform/logging.h>
3535
#include <openthread/platform/memory.h>
36+
#include <stdio.h>
3637

3738
#if defined(_WIN32)
3839
#include <stdarg.h>
@@ -189,7 +190,7 @@ __inline int windows_kernel_snprintf(char * s, size_t n, const char * format, ..
189190
//#define MBEDTLS_PLATFORM_TIME_ALT
190191
//#define MBEDTLS_PLATFORM_FPRINTF_ALT
191192
//#define MBEDTLS_PLATFORM_PRINTF_ALT
192-
//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
193+
#define MBEDTLS_PLATFORM_SNPRINTF_ALT
193194
//#define MBEDTLS_PLATFORM_NV_SEED_ALT
194195

195196
/**
@@ -2557,7 +2558,7 @@ __inline int windows_kernel_snprintf(char * s, size_t n, const char * format, ..
25572558
//#define MBEDTLS_PLATFORM_STD_FPRINTF fprintf /**< Default fprintf to use, can be undefined */
25582559
//#define MBEDTLS_PLATFORM_STD_PRINTF printf /**< Default printf to use, can be undefined */
25592560
/* Note: your snprintf must correclty zero-terminate the buffer! */
2560-
//#define MBEDTLS_PLATFORM_STD_SNPRINTF snprintf /**< Default snprintf to use, can be undefined */
2561+
#define MBEDTLS_PLATFORM_STD_SNPRINTF snprintf /**< Default snprintf to use, can be undefined */
25612562
//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS 0 /**< Default exit value to use, can be undefined */
25622563
//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE 1 /**< Default exit value to use, can be undefined */
25632564
//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */

‎example/baremetal/secureshield/secret_normal/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ For nSIM, the commands to run this example are as follows:
4343
.. code-block:: console
4444
4545
$ cd <embarc_root>/example/baremetal/secureshield/secret_normal
46-
$ gmake BOARD=nsim BD_VER=1506 CUR_CORE=arcemsecureshield TOOLCHAIN=mw run
46+
$ gmake BOARD=nsim BD_VER=10 CUR_CORE=arcsem TOOLCHAIN=mw run
4747
4848
For EMSK 2.2, the commands to run this example are as follows:
4949

‎example/baremetal/secureshield/secret_normal/makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ BOARD ?= nsim
99

1010
CUR_CORE ?= arcsem
1111

12-
APPL_DEFINES = -DLIB_SECURESHIELD_OVERRIDES -DNTSHELL_USE_CMDS_PERIPHERAL=0 -DNTSHELL_USE_CMDS_ARC=0
12+
# secureshield doesn't support stack check now
13+
APPL_DEFINES = -DLIB_SECURESHIELD_OVERRIDES -DNTSHELL_USE_CMDS_PERIPHERAL=0\
14+
-DNTSHELL_USE_CMDS_ARC=0 -DARC_FEATURE_STACK_CHECK=0
1315

1416
#
1517
# root dir of embARC

‎example/baremetal/secureshield/secret_secure/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For nSIM, the commands to run this example are as follows:
4242
.. code-block:: console
4343
4444
$ cd <embarc_root>/example/baremetal/secureshield/secret_secure
45-
$ gmake BOARD=nsim BD_VER=1506 CUR_CORE=arcemsecureshield TOOLCHAIN=mw run
45+
$ gmake BOARD=nsim BD_VER=10 CUR_CORE=arcsem TOOLCHAIN=mw run
4646
4747
For EMSK 2.2, the commands to run this example are as follows:
4848

‎example/baremetal/secureshield/secret_secure/makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ BOARD ?= nsim
99

1010
CUR_CORE ?= arcsem
1111

12-
APPL_DEFINES = -DLIB_SECURESHIELD_OVERRIDES -DNTSHELL_USE_CMDS_PERIPHERAL=0 -DNTSHELL_USE_CMDS_ARC=0
12+
# secureshield doesn't support stack check now
13+
APPL_DEFINES = -DLIB_SECURESHIELD_OVERRIDES -DNTSHELL_USE_CMDS_PERIPHERAL=0\
14+
-DNTSHELL_USE_CMDS_ARC=0 -DARC_FEATURE_STACK_CHECK=0
1315

1416
#
1517
# root dir of embARC

‎example/baremetal/secureshield/secret_secure_sid/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For nSIM, the commands to run this example are as follows:
4444
.. code-block:: console
4545
4646
$ cd <embarc_root>/example/baremetal/secureshield/secret_secure_sid
47-
$ gmake BOARD=nsim BD_VER=1506 CUR_CORE=arcemsecureshield TOOLCHAIN=mw run
47+
$ gmake BOARD=nsim BD_VER=10 CUR_CORE=arcsem TOOLCHAIN=mw run
4848
4949
For EMSK 2.3, the commands to run this example are as follows:
5050

‎example/baremetal/secureshield/secret_secure_sid/makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ BOARD ?= nsim
1010

1111
CUR_CORE = arcsem
1212

13-
APPL_DEFINES = -DNTSHELL_USE_CMDS_PERIPHERAL=0 -DNTSHELL_USE_CMDS_ARC=0
13+
# secureshield doesn't support stack check now
14+
APPL_DEFINES = -DNTSHELL_USE_CMDS_PERIPHERAL=0 -DNTSHELL_USE_CMDS_ARC=0\
15+
-DARC_FEATURE_STACK_CHECK=0
1416

1517
#
1618
# root dir of embARC

0 commit comments

Comments
 (0)