Skip to content

format Kconfig Sconscript Sconsctruct #6826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mysterywolf wants to merge 1 commit into from
Closed

format Kconfig Sconscript Sconsctruct #6826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion bsp/CME_M7/CMSIS/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ src = Split("""
CME_M7/system_cmem7.c
""")

# add for startup script
# add for startup script
if rtconfig.PLATFORM in ['gcc']:
src += ['CME_M7/startup/gcc/startup_CME_M7.c']
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
Expand Down
2 changes: 1 addition & 1 deletion bsp/CME_M7/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/Kconfig"

config SOC_CME_M7
bool
bool
select ARCH_ARM_CORTEX_M3
select RT_USING_COMPONENTS_INIT
default y
14 changes: 7 additions & 7 deletions bsp/CME_M7/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ TARGET = 'rtthread.' + rtconfig.TARGET_EXT

DefaultEnvironment(tools=[])
env = Environment(tools = ['mingw'],
AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS,
AR = rtconfig.AR, ARFLAGS = '-rc',
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS,
AR = rtconfig.AR, ARFLAGS = '-rc',
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

if rtconfig.PLATFORM in ['iccarm']:
env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])

Export('RTT_ROOT')
Export('rtconfig')
Expand Down
4 changes: 2 additions & 2 deletions bsp/CME_M7/drivers/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ from building import *

cwd = os.path.join(str(Dir('#')), 'drivers')

src = ['board.c']
src = ['board.c']

# add uart driver.
src += ['uart.c']
src += ['uart.c']

# add EMAC driver for Lwip.
if GetDepend('RT_USING_LWIP') == True:
Expand Down
8 changes: 4 additions & 4 deletions bsp/ESP32_C3/drivers/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

config SOC_ESPRESSIF
bool
bool

config SOC_ESP32_C3
bool
Expand All @@ -24,7 +24,7 @@ choice
bool "LUATOS ESP32C3 board"

config BSP_BOARD_HX_EXP32C3
bool "HONGXU ESP32C3 board"
bool "HONGXU ESP32C3 board"
endchoice

menu "Onboard Peripheral Drivers"
Expand Down Expand Up @@ -57,9 +57,9 @@ menu "On-chip Peripheral Drivers"
bool "Enable GPIO"
select RT_USING_PIN
default y

config BSP_USING_UART
bool "Enable UART"
bool "Enable UART"
select RT_USING_SERIAL
select RT_USING_SERIAL_V1
default y
Expand Down
2 changes: 1 addition & 1 deletion bsp/ESP32_C3/drivers/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import os
from building import *

cwd = GetCurrentDir()
src = Glob('*.c')
src = Glob('*.c')

CPPPATH = [cwd]

Expand Down
2 changes: 1 addition & 1 deletion bsp/ESP32_C3/main/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import os
from building import *

cwd = GetCurrentDir()
src = Glob('*.c')
src = Glob('*.c')

CPPPATH = []

Expand Down
8 changes: 4 additions & 4 deletions bsp/Infineon/libraries/HAL_Drivers/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ if GetDepend('BSP_USING_ON_CHIP_FLASH'):

if GetDepend(['RT_USING_WDT']):
src += ['drv_wdt.c']

if GetDepend(['RT_USING_DAC']):
src += ['drv_dac.c']
src += ['drv_dac.c']

if GetDepend(['BSP_USING_TIM']):
src += ['drv_hwtimer.c']
src += ['drv_hwtimer.c']

path = [cwd]
path += [cwd + '/config']
Expand Down
10 changes: 5 additions & 5 deletions bsp/Infineon/libraries/IFX_PSOC6_HAL/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ src = Split('''
mtb-hal-cat1/source/cyhal_utils_psoc.c
mtb-hal-cat1/source/cyhal_utils.c
mtb-hal-cat1/source/cyhal_lptimer.c
mtb-hal-cat1/source/cyhal_irq_psoc.c
mtb-hal-cat1/source/cyhal_irq_psoc.c
mtb-hal-cat1/COMPONENT_CAT1A/source/triggers/cyhal_triggers_psoc6_02.c
mtb-hal-cat1/COMPONENT_CAT1A/source/pin_packages/cyhal_psoc6_02_124_bga.c
mtb-pdl-cat1/devices/COMPONENT_CAT1A/source/cy_device.c
Expand All @@ -36,15 +36,15 @@ src = Split('''
mtb-pdl-cat1/drivers/source/cy_ipc_sema.c
mtb-pdl-cat1/drivers/source/cy_ipc_drv.c
mtb-pdl-cat1/drivers/source/cy_trigmux.c
mtb-pdl-cat1/drivers/source/cy_prot.c
mtb-pdl-cat1/drivers/source/cy_prot.c
TARGET_CY8CKIT-062S2-43012/cybsp.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_CM4/system_psoc6_cm4.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_system.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_routing.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c
TARGET_CY8CKIT-062S2-43012/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c
lib/cy_capsense.lib
''')

Expand Down Expand Up @@ -130,10 +130,10 @@ if GetDepend(['RT_USING_WDT']):
src += ['mtb-hal-cat1/source/cyhal_wdt.c']

if GetDepend(['RT_USING_DAC']):
src += ['mtb_shared/csdidac/cy_csdidac.c']
src += ['mtb_shared/csdidac/cy_csdidac.c']

if GetDepend(['RT_USING_HWTIMER']):
src += ['mtb-hal-cat1/source/cyhal_timer.c']
src += ['mtb-hal-cat1/source/cyhal_timer.c']

path = [cwd + '/capsense',
cwd + '/psoc6cm0p',
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/libraries/templates/PSOC62/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ config PKGS_DIR
string
option env="PKGS_ROOT"
default "packages"

source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/Kconfig"
source "../libraries/Kconfig"
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/libraries/templates/PSOC62/applications/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ for item in list:
if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
group = group + SConscript(os.path.join(item, 'SConscript'))

Return('group')
Return('group')
10 changes: 5 additions & 5 deletions bsp/Infineon/libraries/templates/PSOC62/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ menu "On-chip Peripheral Drivers"
default n
config BSP_USING_UART5
bool "Enable UART5"
default y
default y
endif

menuconfig BSP_USING_PWM
Expand Down Expand Up @@ -112,7 +112,7 @@ menu "On-chip Peripheral Drivers"
if BSP_USING_SPI3
config BSP_USING_SPI3_SAMPLE
bool "Enable SPI3 BUS Sample"
default n
default n
endif
endif

Expand Down Expand Up @@ -178,7 +178,7 @@ menu "On-chip Peripheral Drivers"
int "i2c6 SDA pin number"
range 1 113
default 105
endif
endif
endif

menuconfig BSP_USING_I2C
Expand Down Expand Up @@ -234,7 +234,7 @@ menu "On-chip Peripheral Drivers"
bool "Enable Watchdog Timer"
select RT_USING_WDT
default n

menuconfig BSP_USING_DAC
bool "Enable DAC"
default n
Expand Down Expand Up @@ -278,7 +278,7 @@ menu "Board extended module Drivers"
select PKG_USING_RW007
select BSP_USING_SPI
select RW007_NOT_USE_EXAMPLE_DRIVERS

if BSP_USING_RW007
comment "Notice: P5_7 --> 47; P6_2 -->50; P6_5 --> 53; P12_0 --> 96"
config IFX_RW007_SPI_BUS_NAME
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/libraries/templates/PSOC62/board/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']:
CPPDEFINES = ['CY8C624ABZI_S2D44', 'IFX_PSOC6_43012', 'CY_USING_HAL', 'COMPONENT_CAT1A', 'COMPONENT_CAT1', 'COMPONENT_BSP_DESIGN_MODUS']
group = DefineGroup('Drivers', src, depend=[''], CPPPATH=path, CPPDEFINES=CPPDEFINES)

Return('group')
Return('group')
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062S2-43012/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ config PKGS_DIR
string
option env="PKGS_ROOT"
default "packages"

source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/Kconfig"
source "../libraries/Kconfig"
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062S2-43012/applications/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ for item in list:
if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
group = group + SConscript(os.path.join(item, 'SConscript'))

Return('group')
Return('group')
10 changes: 5 additions & 5 deletions bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ menu "On-chip Peripheral Drivers"
default n
config BSP_USING_UART5
bool "Enable UART5"
default y
default y
endif

menuconfig BSP_USING_PWM
Expand Down Expand Up @@ -112,7 +112,7 @@ menu "On-chip Peripheral Drivers"
if BSP_USING_SPI3
config BSP_USING_SPI3_SAMPLE
bool "Enable SPI3 BUS Sample"
default n
default n
endif
endif

Expand Down Expand Up @@ -178,7 +178,7 @@ menu "On-chip Peripheral Drivers"
int "i2c6 SDA pin number"
range 1 113
default 105
endif
endif
endif

menuconfig BSP_USING_I2C
Expand Down Expand Up @@ -234,7 +234,7 @@ menu "On-chip Peripheral Drivers"
bool "Enable Watchdog Timer"
select RT_USING_WDT
default n

menuconfig BSP_USING_DAC
bool "Enable DAC"
default n
Expand Down Expand Up @@ -278,7 +278,7 @@ menu "Board extended module Drivers"
select PKG_USING_RW007
select BSP_USING_SPI
select RW007_NOT_USE_EXAMPLE_DRIVERS

if BSP_USING_RW007
comment "Notice: P5_7 --> 47; P6_2 -->50; P6_5 --> 53; P12_0 --> 96"
config IFX_RW007_SPI_BUS_NAME
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']:
CPPDEFINES = ['CY8C624ABZI_S2D44', 'IFX_PSOC6_43012', 'CY_USING_HAL', 'COMPONENT_CAT1A', 'COMPONENT_CAT1', 'COMPONENT_BSP_DESIGN_MODUS']
group = DefineGroup('Drivers', src, depend=[''], CPPPATH=path, CPPDEFINES=CPPDEFINES)

Return('group')
Return('group')
2 changes: 1 addition & 1 deletion bsp/Vango/v85xx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ config RTT_DIR
string
option env="RTT_ROOT"
default "../../.."

# you can change the RTT_ROOT default: "rt-thread"
# example : default "F:/git_repositories/rt-thread"

Expand Down
2 changes: 1 addition & 1 deletion bsp/Vango/v85xxp/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ config RTT_DIR
string
option env="RTT_ROOT"
default "../../.."

# you can change the RTT_ROOT default: "rt-thread"
# example : default "F:/git_repositories/rt-thread"

Expand Down
14 changes: 7 additions & 7 deletions bsp/acm32/acm32f4xx-nucleo/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ from building import *
TARGET = 'rtthread_acm32f4xx.' + rtconfig.TARGET_EXT

env = Environment(tools = ['mingw'],
AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS,
AR = rtconfig.AR, ARFLAGS = '-rc',
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS,
AR = rtconfig.AR, ARFLAGS = '-rc',
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

if rtconfig.PLATFORM in ['iccarm']:
env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])

Export('RTT_ROOT')
Export('rtconfig')
Expand Down
2 changes: 1 addition & 1 deletion bsp/airm2m/air105/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ config PKGS_DIR
string
option env="PKGS_ROOT"
default "packages"

source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/Kconfig"
source "board/Kconfig"
Expand Down
12 changes: 6 additions & 6 deletions bsp/airm2m/air105/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ menu "Onboard Peripheral Drivers"
config WIZ_SPI_BUS
string "WIZ SPI bus name"
default "spi2"
config WIZ_SPI_CS
config WIZ_SPI_CS
int "WIZ SPI bus cs pin"
default 19
default 19
endif

endmenu
Expand Down Expand Up @@ -129,7 +129,7 @@ menu "On-chip Peripheral Drivers"
if BSP_USING_I2C
config I2C_BUS_NAME
string "HW I2C bus name"
default "i2c"
default "i2c"
endif

menuconfig BSP_USING_SPI
Expand All @@ -151,8 +151,8 @@ menu "On-chip Peripheral Drivers"

config BSP_USING_SPI2
bool "Enable SPI2 BUS"
default n
default n

config BSP_USING_SPI0S
bool "Enable SPI0S BUS"
default n
Expand All @@ -162,7 +162,7 @@ menu "On-chip Peripheral Drivers"
bool "Enable HW onchip rtc"
select RT_USING_ONCHIP_RTC
default n

config BSP_USING_WDT
bool "Enable Watchdog Timer"
select RT_USING_WDT
Expand Down
2 changes: 1 addition & 1 deletion bsp/airm2m/air32f103/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ config PKGS_DIR
string
option env="PKGS_ROOT"
default "packages"

source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/Kconfig"
source "board/Kconfig"
Expand Down
Loading