From 23e2c17a0f3468bf8f8adab669fb437d6daae57a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 30 Mar 2020 14:31:10 +0900 Subject: [PATCH] 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 ed65316696..39b5331a69 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 f4026233f5..db4394a8c3 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 fa5473ee32..c7d9334af1 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 f355d8df5a..b856ad5599 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 cfd09e1a05..2939dd071c 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