Skip to content

R
rt-thread

PHPmihuan / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 1
Star 0
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 fbe9571c 编写于 作者: B Bernard Xiong 提交者： GitHub
浏览文件
操作

Merge pull request #1062 from BernardXiong/master 

[Kconfig] Rename all of KConfig files to 'Kconfig'
上级 4165efaf 7bc87e4a
隐藏空白更改
内联 并排
Showing with 124 addition and 92 deletion
KConfig → Kconfig
浏览文件 @ fbe9571c
source "$RTT_DIR/src/KConfig" source "$RTT_DIR/src/Kconfig"
source "$RTT_DIR/libcpu/Kconfig" source "$RTT_DIR/libcpu/Kconfig"
source "$RTT_DIR/components/KConfig" source "$RTT_DIR/components/Kconfig"
bsp/asm9260t/KConfig → bsp/asm9260t/Kconfig
浏览文件 @ fbe9571c
...@@ -15,10 +15,8 @@ config $PKGS_DIR ...@@ -15,10 +15,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
menu "BSP_SPECIAL CONFIG"
config RT_USING_UART0 config RT_USING_UART0
bool "Using RT_USING_UART0" bool "Using RT_USING_UART0"
...@@ -37,9 +35,4 @@ config RT_USING_LED ...@@ -37,9 +35,4 @@ config RT_USING_LED
default y default y
help help
led blink demo led blink demo
endmenu
\ No newline at end of file
bsp/imx6ul/KConfig → bsp/imx6ul/Kconfig
浏览文件 @ fbe9571c
...@@ -20,7 +20,7 @@ config BOARD_IMX6UL ...@@ -20,7 +20,7 @@ config BOARD_IMX6UL
select ARCH_ARM_CORTEX_A7 select ARCH_ARM_CORTEX_A7
default y default y
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
source "$BSP_DIR/drivers/Kconfig" source "$BSP_DIR/drivers/Kconfig"
bsp/imxrt1052-evk/KConfig → bsp/imxrt1052-evk/Kconfig
浏览文件 @ fbe9571c
...@@ -15,10 +15,8 @@ config $PKGS_DIR ...@@ -15,10 +15,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
menu "BSP_SPECIAL CONFIG"
config RT_USING_UART config RT_USING_UART
bool "Using RT_USING_UART" bool "Using RT_USING_UART"
...@@ -29,10 +27,4 @@ config RT_USING_UART1 ...@@ -29,10 +27,4 @@ config RT_USING_UART1
bool "Using RT_USING_UART1" bool "Using RT_USING_UART1"
default y default y
endif endif
endmenu
\ No newline at end of file
bsp/lpc54608-LPCXpresso/Kconfig
浏览文件 @ fbe9571c
...@@ -18,8 +18,8 @@ config $PKGS_DIR ...@@ -18,8 +18,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
config SOC_LPC54608 config SOC_LPC54608
bool bool
...@@ -28,8 +28,3 @@ config SOC_LPC54608 ...@@ -28,8 +28,3 @@ config SOC_LPC54608
source "$BSP_DIR/drivers/Kconfig" source "$BSP_DIR/drivers/Kconfig"
\ No newline at end of file
bsp/qemu-vexpress-a9/Kconfig
浏览文件 @ fbe9571c
...@@ -15,6 +15,6 @@ config $PKGS_DIR ...@@ -15,6 +15,6 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
source "$BSP_DIR/drivers/Kconfig" source "$BSP_DIR/drivers/Kconfig"
bsp/stm32f10x-HAL/KConfig → bsp/stm32f10x-HAL/Kconfig
浏览文件 @ fbe9571c
...@@ -15,8 +15,8 @@ config $PKGS_DIR ...@@ -15,8 +15,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
choice choice
prompt "Device type" prompt "Device type"
...@@ -182,8 +182,3 @@ if RT_USING_SPI ...@@ -182,8 +182,3 @@ if RT_USING_SPI
default n default n
endif endif
\ No newline at end of file
bsp/stm32f411-nucleo/KConfig → bsp/stm32f411-nucleo/Kconfig
浏览文件 @ fbe9571c
...@@ -15,18 +15,10 @@ config $PKGS_DIR ...@@ -15,18 +15,10 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
menu "BSP_SPECIAL CONFIG"
config RT_USING_UART2 config RT_USING_UART2
bool "Using RT_USING_UART2" bool "Using RT_USING_UART2"
default y default y
endmenu
\ No newline at end of file
bsp/stm32f429-apollo/KConfig → bsp/stm32f429-apollo/Kconfig
浏览文件 @ fbe9571c
...@@ -20,7 +20,7 @@ config BOARD_STM32F429_APPOLO ...@@ -20,7 +20,7 @@ config BOARD_STM32F429_APPOLO
select ARCH_ARM_CORTEX_M4 select ARCH_ARM_CORTEX_M4
default y default y
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
source "$BSP_DIR/drivers/Kconfig" source "$BSP_DIR/drivers/Kconfig"
bsp/stm32f429-disco/Kconfig
浏览文件 @ fbe9571c
...@@ -18,14 +18,8 @@ config $PKGS_DIR ...@@ -18,14 +18,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
source "$BSP_DIR/drivers/Kconfig" source "$BSP_DIR/drivers/Kconfig"
\ No newline at end of file
bsp/stm32f4xx-HAL/KConfig → bsp/stm32f4xx-HAL/Kconfig
浏览文件 @ fbe9571c
...@@ -15,8 +15,8 @@ config $PKGS_DIR ...@@ -15,8 +15,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
choice choice
...@@ -339,4 +339,4 @@ endif ...@@ -339,4 +339,4 @@ endif
\ No newline at end of file
bsp/stm32l476-nucleo/Kconfig
浏览文件 @ fbe9571c
...@@ -18,6 +18,6 @@ config $PKGS_DIR ...@@ -18,6 +18,6 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
source "$BSP_DIR/drivers/Kconfig" source "$BSP_DIR/drivers/Kconfig"
bsp/tm4c129x/KConfig → bsp/tm4c129x/Kconfig
浏览文件 @ fbe9571c
...@@ -15,18 +15,10 @@ config $PKGS_DIR ...@@ -15,18 +15,10 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
menu "BSP_SPECIAL CONFIG"
config RT_USING_UART0 config RT_USING_UART0
bool "Using RT_USING_UART0" bool "Using RT_USING_UART0"
default y default y
endmenu
\ No newline at end of file
bsp/x1000/Kconfig
浏览文件 @ fbe9571c
...@@ -18,8 +18,8 @@ config $PKGS_DIR ...@@ -18,8 +18,8 @@ config $PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "$RTT_DIR/KConfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/KConfig" source "$PKGS_DIR/Kconfig"
config BOARD_X1000_REALBOARD config BOARD_X1000_REALBOARD
bool bool
......
components/KConfig → components/Kconfig
浏览文件 @ fbe9571c
...@@ -10,17 +10,17 @@ if RT_USING_COMPONENTS_INIT ...@@ -10,17 +10,17 @@ if RT_USING_COMPONENTS_INIT
default y default y
endif endif
source "$RTT_DIR/components/cplusplus/KConfig" source "$RTT_DIR/components/cplusplus/Kconfig"
source "$RTT_DIR/components/finsh/KConfig" source "$RTT_DIR/components/finsh/Kconfig"
source "$RTT_DIR/components/dfs/KConfig" source "$RTT_DIR/components/dfs/Kconfig"
source "$RTT_DIR/components/drivers/KConfig" source "$RTT_DIR/components/drivers/Kconfig"
source "$RTT_DIR/components/libc/KConfig" source "$RTT_DIR/components/libc/Kconfig"
source "$RTT_DIR/components/net/KConfig" source "$RTT_DIR/components/net/Kconfig"
source "$RTT_DIR/components/gui/Kconfig" source "$RTT_DIR/components/gui/Kconfig"
......
components/net/KConfig → components/net/Kconfig
浏览文件 @ fbe9571c
...@@ -180,7 +180,7 @@ config RT_USING_LWIP ...@@ -180,7 +180,7 @@ config RT_USING_LWIP
endmenu endmenu
source "$RTT_DIR/components/net/freemodbus/KConfig" source "$RTT_DIR/components/net/freemodbus/Kconfig"
if RT_USING_LWIP if RT_USING_LWIP
config RT_USING_NETUTILS config RT_USING_NETUTILS
......
include/rtdef.h
浏览文件 @ fbe9571c
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
* 2012-12-30 Bernard add more control command for graphic. * 2012-12-30 Bernard add more control command for graphic.
* 2013-01-09 Bernard change version number. * 2013-01-09 Bernard change version number.
* 2015-02-01 Bernard change version number to v2.1.0 * 2015-02-01 Bernard change version number to v2.1.0
* 2016-08-31 Bernard change version number to v3.0.0 * 2017-08-31 Bernard change version number to v3.0.0
* 2017-11-30 Bernard change version number to v3.0.1
*/ */
#ifndef __RT_DEF_H__ #ifndef __RT_DEF_H__
...@@ -52,7 +53,7 @@ extern "C" { ...@@ -52,7 +53,7 @@ extern "C" {
/* RT-Thread version information */ /* RT-Thread version information */
#define RT_VERSION 3L /**< major version number */ #define RT_VERSION 3L /**< major version number */
#define RT_SUBVERSION 0L /**< minor version number */ #define RT_SUBVERSION 0L /**< minor version number */
#define RT_REVISION 0L /**< revise version number */ #define RT_REVISION 1L /**< revise version number */
/* RT-Thread version */ /* RT-Thread version */
#define RTTHREAD_VERSION ((RT_VERSION * 10000) + \ #define RTTHREAD_VERSION ((RT_VERSION * 10000) + \
......
tools/building.py
浏览文件 @ fbe9571c
...@@ -274,6 +274,17 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ ...@@ -274,6 +274,17 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
genconfig() genconfig()
exit(0) exit(0)
if env['PLATFORM'] != 'win32':
AddOption('--menuconfig',
dest = 'menuconfig',
action = 'store_true',
default = False,
help = 'make menuconfig for RT-Thread BSP')
if GetOption('menuconfig'):
from menuconfig import menuconfig
menuconfig(Rtt_Root)
exit(0)
# add comstr option # add comstr option
AddOption('--verbose', AddOption('--verbose',
dest='verbose', dest='verbose',
......
tools/menuconfig.py
浏览文件 @ fbe9571c
...@@ -29,23 +29,87 @@ def mk_rtconfig(filename): ...@@ -29,23 +29,87 @@ def mk_rtconfig(filename):
empty_line = 1 empty_line = 1
continue continue
rtconfig.write('/*%s */\n' % line[1:]) comment_line = line[1:]
if line.startswith('# CONFIG_'): line = ' ' + line[9:]
else: line = line[1:]
rtconfig.write('/*%s */\n' % line)
empty_line = 0 empty_line = 0
else: else:
empty_line = 0 empty_line = 0
setting = line.split('=', 1) setting = line.split('=')
if len(setting) >= 2: if len(setting) >= 2:
if setting[0].startswith('CONFIG_'): if setting[0].startswith('CONFIG_'):
setting[0] = setting[0][7:] setting[0] = setting[0][7:]
# remove CONFIG_PKG_XX_PATH or CONFIG_PKG_XX_VER
if type(setting[0]) == type('a') and (setting[0].endswith('_PATH') or setting[0].endswith('_VER')):
continue
if setting[1] == 'y': if setting[1] == 'y':
rtconfig.write('#define %s\n' % setting[0]) rtconfig.write('#define %s\n' % setting[0])
else: else:
rtconfig.write('#define %s %s\n' % (setting[0], setting[1])) rtconfig.write('#define %s %s\n' % (setting[0], setting[1]))
if os.path.isfile('rtconfig_project.h'):
rtconfig.write('#include "rtconfig_project.h"\n')
rtconfig.write('\n')
rtconfig.write('#endif\n') rtconfig.write('#endif\n')
rtconfig.close() rtconfig.close()
def config(): def config():
mk_rtconfig('.config') mk_rtconfig('.config')
def get_env_dir():
if os.environ.get('ENV_ROOT'):
return os.environ.get('ENV_ROOT')
home_dir = os.environ['HOME']
env_dir = os.path.join(home_dir, '.env')
if not os.path.exists(env_dir):
return None
return env_dir
def touch_env():
home_dir = os.environ['HOME']
env_dir = os.path.join(home_dir, '.env')
if not os.path.exists(env_dir):
os.mkdir(env_dir)
os.mkdir(os.path.join(env_dir, 'local_pkgs'))
os.mkdir(os.path.join(env_dir, 'packages'))
kconfig = file(os.path.join(env_dir, 'packages', 'Kconfig'), 'w')
# menuconfig for Linux
def menuconfig(RTT_ROOT):
kconfig_dir = os.path.join(RTT_ROOT, 'tools', 'kconfig-frontends')
os.system('scons -C ' + kconfig_dir)
env_dir = get_env_dir()
if not env_dir:
touch_env()
env_dir = get_env_dir()
os.environ['PKGS_ROOT'] = os.path.join(env_dir, 'packages')
fn = '.config'
if os.path.isfile(fn):
mtime = os.path.getmtime(fn)
else:
mtime = -1
kconfig_cmd = os.path.join(RTT_ROOT, 'tools', 'kconfig-frontends', 'kconfig-mconf')
os.system(kconfig_cmd + ' Kconfig')
if os.path.isfile(fn):
mtime2 = os.path.getmtime(fn)
else:
mtime2 = -1
# make rtconfig.h
if mtime != mtime2:
mk_rtconfig(fn)
tools/mkdist.py
浏览文件 @ fbe9571c
...@@ -121,7 +121,7 @@ def MakeCopy(program, BSP_ROOT, RTT_ROOT, Env): ...@@ -121,7 +121,7 @@ def MakeCopy(program, BSP_ROOT, RTT_ROOT, Env):
# copy tools directory # copy tools directory
print("=> tools") print("=> tools")
do_copy_folder(os.path.join(RTT_ROOT, "tools"), os.path.join(target_path, "tools"), ignore_patterns('*.pyc')) do_copy_folder(os.path.join(RTT_ROOT, "tools"), os.path.join(target_path, "tools"), ignore_patterns('*.pyc'))
do_copy_file(os.path.join(RTT_ROOT, 'KConfig'), os.path.join(target_path, 'KConfig')) do_copy_file(os.path.join(RTT_ROOT, 'Kconfig'), os.path.join(target_path, 'Kconfig'))
do_copy_file(os.path.join(RTT_ROOT, 'AUTHORS'), os.path.join(target_path, 'AUTHORS')) do_copy_file(os.path.join(RTT_ROOT, 'AUTHORS'), os.path.join(target_path, 'AUTHORS'))
do_copy_file(os.path.join(RTT_ROOT, 'COPYING'), os.path.join(target_path, 'COPYING')) do_copy_file(os.path.join(RTT_ROOT, 'COPYING'), os.path.join(target_path, 'COPYING'))
do_copy_file(os.path.join(RTT_ROOT, 'README.md'), os.path.join(target_path, 'README.md')) do_copy_file(os.path.join(RTT_ROOT, 'README.md'), os.path.join(target_path, 'README.md'))
...@@ -170,7 +170,7 @@ def MakeCopyHeader(program, BSP_ROOT, RTT_ROOT, Env): ...@@ -170,7 +170,7 @@ def MakeCopyHeader(program, BSP_ROOT, RTT_ROOT, Env):
# copy tools directory # copy tools directory
print "=> tools" print "=> tools"
do_copy_folder(os.path.join(RTT_ROOT, "tools"), os.path.join(target_path, "tools"), ignore_patterns('*.pyc')) do_copy_folder(os.path.join(RTT_ROOT, "tools"), os.path.join(target_path, "tools"), ignore_patterns('*.pyc'))
do_copy_file(os.path.join(RTT_ROOT, 'KConfig'), os.path.join(target_path, 'KConfig')) do_copy_file(os.path.join(RTT_ROOT, 'Kconfig'), os.path.join(target_path, 'Kconfig'))
do_copy_file(os.path.join(RTT_ROOT, 'AUTHORS'), os.path.join(target_path, 'AUTHORS')) do_copy_file(os.path.join(RTT_ROOT, 'AUTHORS'), os.path.join(target_path, 'AUTHORS'))
do_copy_file(os.path.join(RTT_ROOT, 'COPYING'), os.path.join(target_path, 'COPYING')) do_copy_file(os.path.join(RTT_ROOT, 'COPYING'), os.path.join(target_path, 'COPYING'))
do_copy_file(os.path.join(RTT_ROOT, 'README.md'), os.path.join(target_path, 'README.md')) do_copy_file(os.path.join(RTT_ROOT, 'README.md'), os.path.join(target_path, 'README.md'))
...@@ -242,7 +242,7 @@ def MkDist(program, BSP_ROOT, RTT_ROOT, Env): ...@@ -242,7 +242,7 @@ def MkDist(program, BSP_ROOT, RTT_ROOT, Env):
# copy tools directory # copy tools directory
print("=> tools") print("=> tools")
do_copy_folder(os.path.join(RTT_ROOT, "tools"), os.path.join(target_path, "tools"), ignore_patterns('*.pyc')) do_copy_folder(os.path.join(RTT_ROOT, "tools"), os.path.join(target_path, "tools"), ignore_patterns('*.pyc'))
do_copy_file(os.path.join(RTT_ROOT, 'KConfig'), os.path.join(target_path, 'KConfig')) do_copy_file(os.path.join(RTT_ROOT, 'Kconfig'), os.path.join(target_path, 'Kconfig'))
do_copy_file(os.path.join(RTT_ROOT, 'AUTHORS'), os.path.join(target_path, 'AUTHORS')) do_copy_file(os.path.join(RTT_ROOT, 'AUTHORS'), os.path.join(target_path, 'AUTHORS'))
do_copy_file(os.path.join(RTT_ROOT, 'COPYING'), os.path.join(target_path, 'COPYING')) do_copy_file(os.path.join(RTT_ROOT, 'COPYING'), os.path.join(target_path, 'COPYING'))
do_copy_file(os.path.join(RTT_ROOT, 'README.md'), os.path.join(target_path, 'README.md')) do_copy_file(os.path.join(RTT_ROOT, 'README.md'), os.path.join(target_path, 'README.md'))
...@@ -265,7 +265,7 @@ def MkDist(program, BSP_ROOT, RTT_ROOT, Env): ...@@ -265,7 +265,7 @@ def MkDist(program, BSP_ROOT, RTT_ROOT, Env):
except : except :
print('') print('')
# change RTT_ROOT in KConfig # change RTT_ROOT in Kconfig
try: try:
if os.path.exists(os.path.join(BSP_ROOT, 'Kconfig')): if os.path.exists(os.path.join(BSP_ROOT, 'Kconfig')):
Kconfig = file(os.path.join(BSP_ROOT, 'Kconfig')) Kconfig = file(os.path.join(BSP_ROOT, 'Kconfig'))
......
tools/wizard.py 100755 → 100644
浏览文件 @ fbe9571c
文件模式从 100755 更改为 100644
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或