nuttx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiaoxi...@apache.org
Subject [incubator-nuttx] branch master updated: sim: Remove CONFIG_SIM_M32 and CONFIG_ELF where unnecessary
Date Mon, 30 Mar 2020 07:26:12 GMT
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 23e2c17  sim: Remove CONFIG_SIM_M32 and CONFIG_ELF where unnecessary
23e2c17 is described below

commit 23e2c17a0f3468bf8f8adab669fb437d6daae57a
Author: YAMAMOTO Takashi <yamamoto@midokura.com>
AuthorDate: Mon Mar 30 14:31:10 2020 +0900

    sim: Remove CONFIG_SIM_M32 and CONFIG_ELF where unnecessary
    
    Namely these defconfig files:
    
        boards/sim/sim/sim/configs/mtdpart/defconfig
        boards/sim/sim/sim/configs/mtdrwb/defconfig
        boards/sim/sim/sim/configs/rpproxy/defconfig
        boards/sim/sim/sim/configs/rpserver/defconfig
        boards/sim/sim/sim/configs/tcpblaster/defconfig
    
    Because the recent versions of macOS is 64-bit only and thus
    incompatible with CONFIG_SIM_M32=y.
    
    The following defconfig files are left intact as these configs
    are important for them:
    
        boards/sim/sim/sim/configs/loadable/defconfig
        boards/sim/sim/sim/configs/module32/defconfig
---
 boards/sim/sim/sim/configs/mtdpart/defconfig    | 1 -
 boards/sim/sim/sim/configs/mtdrwb/defconfig     | 1 -
 boards/sim/sim/sim/configs/rpproxy/defconfig    | 1 -
 boards/sim/sim/sim/configs/rpserver/defconfig   | 1 -
 boards/sim/sim/sim/configs/tcpblaster/defconfig | 3 ---
 5 files changed, 7 deletions(-)

diff --git a/boards/sim/sim/sim/configs/mtdpart/defconfig b/boards/sim/sim/sim/configs/mtdpart/defconfig
index ed65316..39b5331 100644
--- a/boards/sim/sim/sim/configs/mtdpart/defconfig
+++ b/boards/sim/sim/sim/configs/mtdpart/defconfig
@@ -26,7 +26,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_RAMMTD=y
 CONFIG_RAMMTD_FLASHSIM=y
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_M32=y
 CONFIG_START_DAY=29
 CONFIG_START_MONTH=4
 CONFIG_START_YEAR=2011
diff --git a/boards/sim/sim/sim/configs/mtdrwb/defconfig b/boards/sim/sim/sim/configs/mtdrwb/defconfig
index f402623..db4394a 100644
--- a/boards/sim/sim/sim/configs/mtdrwb/defconfig
+++ b/boards/sim/sim/sim/configs/mtdrwb/defconfig
@@ -31,7 +31,6 @@ CONFIG_RAMMTD_FLASHSIM=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_M32=y
 CONFIG_START_DAY=29
 CONFIG_START_MONTH=4
 CONFIG_START_YEAR=2011
diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig b/boards/sim/sim/sim/configs/rpproxy/defconfig
index fa5473e..c7d9334 100644
--- a/boards/sim/sim/sim/configs/rpproxy/defconfig
+++ b/boards/sim/sim/sim/configs/rpproxy/defconfig
@@ -47,7 +47,6 @@ CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
-CONFIG_SIM_M32=y
 CONFIG_SIM_WALLTIME=y
 CONFIG_SYSLOG_PREFIX=y
 CONFIG_SYSLOG_PREFIX_STRING="proxy: "
diff --git a/boards/sim/sim/sim/configs/rpserver/defconfig b/boards/sim/sim/sim/configs/rpserver/defconfig
index f355d8d..b856ad5 100644
--- a/boards/sim/sim/sim/configs/rpserver/defconfig
+++ b/boards/sim/sim/sim/configs/rpserver/defconfig
@@ -54,7 +54,6 @@ CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
-CONFIG_SIM_M32=y
 CONFIG_SIM_NET_BRIDGE=y
 CONFIG_SIM_RPTUN_MASTER=y
 CONFIG_SYSLOG_PREFIX=y
diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig
index cfd09e1..2939dd0 100644
--- a/boards/sim/sim/sim/configs/tcpblaster/defconfig
+++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig
@@ -21,11 +21,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_VIDEO=y
-CONFIG_ELF=y
 CONFIG_EXAMPLES_FTPC=y
 CONFIG_EXAMPLES_TCPBLASTER=y
 CONFIG_EXAMPLES_TCPECHO=y
-CONFIG_EXECFUNCS_HAVE_SYMTAB=y
 CONFIG_FS_BINFS=y
 CONFIG_FS_HOSTFS=y
 CONFIG_FS_LITTLEFS=y
@@ -111,7 +109,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SERIAL_TERMIOS=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_SIG_EVTHREAD=y
-CONFIG_SIM_M32=y
 CONFIG_STACK_COLORATION=y
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSLOG_CONSOLE=y


Mime
View raw message