michaelh/zephyr
1
0
Fork 0
Code Releases Activity

devicetree: Generate CONFIG_UART_CONSOLE_ON_DEV_NAME from dt

Browse source 
We can use the chosen property "zephyr,console" to determine what uart
should be used as the console and find its name to generate a define for
CONFIG_UART_CONSOLE_ON_DEV_NAME.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2017-07-07 11:05:05 -05:00 • committed by Kumar Gala
commit 65e72be8f7
26 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
View file

@ -235,7 +235,7 @@ endif # UART_QMSI_1
endif # UART_QMSI endif # UART_QMSI
if UART_CONSOLE if UART_CONSOLE && !HAS_DTS
config UART_CONSOLE_ON_DEV_NAME config UART_CONSOLE_ON_DEV_NAME
default "UART_1" if USB_UART_CONSOLE = n default "UART_1" if USB_UART_CONSOLE = n

2
boards/arm/96b_carbon/96b_carbon_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART1 - passthrough to FT230XQ # enable USART1 - passthrough to FT230XQ
CONFIG_UART_STM32_PORT_1=y CONFIG_UART_STM32_PORT_1=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
# enable I2C1 # enable I2C1
CONFIG_I2C=y CONFIG_I2C=y

1
boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig
View file

@ -38,7 +38,6 @@ CONFIG_CLOCK_STM32_APB2_PRESCALER=1
# console # console
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
#enable pwm #enable pwm
CONFIG_PWM=y CONFIG_PWM=y

1
boards/arm/mps2_an385/mps2_an385_defconfig
View file

@ -23,7 +23,6 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_CMSDK_APB=y CONFIG_UART_CMSDK_APB=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_0"
# Watchdog # Watchdog
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y

1
boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig
View file

@ -15,7 +15,6 @@ CONFIG_UART_STM32_PORT_2=y
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig
View file

@ -26,7 +26,6 @@ CONFIG_UART_STM32_PORT_2=y
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# Pinmux Driver # Pinmux Driver
CONFIG_PINMUX=y CONFIG_PINMUX=y

2
boards/arm/nucleo_f401re/nucleo_f401re_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART2 - passthrough to STLINK v2 connector # enable USART2 - passthrough to STLINK v2 connector
CONFIG_UART_STM32_PORT_2=y CONFIG_UART_STM32_PORT_2=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

2
boards/arm/nucleo_f411re/nucleo_f411re_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART2 - passthrough to STLINK v2 connector # enable USART2 - passthrough to STLINK v2 connector
CONFIG_UART_STM32_PORT_2=y CONFIG_UART_STM32_PORT_2=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

2
boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART3 - passthrough to STLINK v2 connector # enable USART3 - passthrough to STLINK v2 connector
CONFIG_UART_STM32_PORT_3=y CONFIG_UART_STM32_PORT_3=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_3"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

2
boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART2 - passthrough to STLINK v2 connector # enable USART2 - passthrough to STLINK v2 connector
CONFIG_UART_STM32_PORT_3=y CONFIG_UART_STM32_PORT_3=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_3"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig
View file

@ -43,7 +43,6 @@ CONFIG_CLOCK_STM32_APB2_PRESCALER=1
# console # console
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
#enable pwm #enable pwm
CONFIG_PWM=y CONFIG_PWM=y

1
boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig
View file

@ -47,7 +47,6 @@ CONFIG_CLOCK_STM32_APB2_PRESCALER=1
# console # console
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
#enable pwm #enable pwm
CONFIG_PWM=y CONFIG_PWM=y

2
boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART1 # enable USART1
CONFIG_UART_STM32_PORT_1=y CONFIG_UART_STM32_PORT_1=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/olimexino_stm32/olimexino_stm32_defconfig
View file

@ -15,7 +15,6 @@ CONFIG_UART_STM32_PORT_1=y
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
# enable I2C driver # enable I2C driver
CONFIG_I2C=y CONFIG_I2C=y

1
boards/arm/sam4s_xplained/sam4s_xplained_defconfig
View file

@ -5,7 +5,6 @@ CONFIG_SOC_PART_NUMBER_SAM4S16C=y
CONFIG_CORTEX_M_SYSTICK=y CONFIG_CORTEX_M_SYSTICK=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_SAM=y CONFIG_UART_SAM=y
CONFIG_UART_SAM_PORT_1=y CONFIG_UART_SAM_PORT_1=y

1
boards/arm/sam_e70_xplained/sam_e70_xplained_defconfig
View file

@ -9,7 +9,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=300000000
CONFIG_CORTEX_M_SYSTICK=y CONFIG_CORTEX_M_SYSTICK=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="USART_1"
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_USART_SAM=y CONFIG_USART_SAM=y
CONFIG_USART_SAM_PORT_1=y CONFIG_USART_SAM_PORT_1=y

1
boards/arm/stm3210c_eval/stm3210c_eval_defconfig
View file

@ -27,7 +27,6 @@ CONFIG_UART_STM32_PORT_2=y
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# Pinmux Driver # Pinmux Driver
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/stm32373c_eval/stm32373c_eval_defconfig
View file

@ -33,7 +33,6 @@ CONFIG_UART_STM32_PORT_2_NAME="UART_2"
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# Pinmux Driver # Pinmux Driver
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/stm32_min_dev/stm32_min_dev_defconfig
View file

@ -18,7 +18,6 @@ CONFIG_UART_STM32_PORT_1=y
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/stm32f3_disco/stm32f3_disco_defconfig
View file

@ -20,7 +20,6 @@ CONFIG_UART_STM32_PORT_1=y
# enable console on this port by default # enable console on this port by default
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

2
boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART3 - passthrough to STLINK v2 connector # enable USART3 - passthrough to STLINK v2 connector
CONFIG_UART_STM32_PORT_3=y CONFIG_UART_STM32_PORT_3=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_3"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

2
boards/arm/stm32f4_disco/stm32f4_disco_defconfig
View file

@ -11,8 +11,6 @@ CONFIG_STM32_ARM_MPU_ENABLE=y
# enable USART2 - passthrough to STLINK v2 connector # enable USART2 - passthrough to STLINK v2 connector
CONFIG_UART_STM32_PORT_2=y CONFIG_UART_STM32_PORT_2=y
# enable console on this port by default
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
# enable pinmux # enable pinmux
CONFIG_PINMUX=y CONFIG_PINMUX=y

1
boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig
View file

@ -47,7 +47,6 @@ CONFIG_CLOCK_STM32_APB2_PRESCALER=1
# console # console
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_2"
#enable pwm #enable pwm
CONFIG_PWM=y CONFIG_PWM=y

1
boards/arm/v2m_beetle/v2m_beetle_defconfig
View file

@ -29,7 +29,6 @@ CONFIG_PINMUX=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
# Watchdog # Watchdog
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y

2
drivers/console/Kconfig
View file

@ -47,6 +47,7 @@ config UART_CONSOLE
Enable this option to use one UART for console. Make sure Enable this option to use one UART for console. Make sure
CONFIG_UART_CONSOLE_ON_DEV_NAME is also set correctly. CONFIG_UART_CONSOLE_ON_DEV_NAME is also set correctly.
if !HAS_DTS
config UART_CONSOLE_ON_DEV_NAME config UART_CONSOLE_ON_DEV_NAME
string "Device Name of UART Device for UART Console" string "Device Name of UART Device for UART Console"
default "UART_0" default "UART_0"
@ -54,6 +55,7 @@ config UART_CONSOLE_ON_DEV_NAME
help help
This option specifies the name of UART device to be used for This option specifies the name of UART device to be used for
UART console. UART console.
endif
config UART_CONSOLE_INIT_PRIORITY config UART_CONSOLE_INIT_PRIORITY
int int

22
scripts/extract_dts_includes.py
View file

@ -428,6 +428,24 @@ def extract_single(node_address, yaml, prop, key, prefix, defs, def_label):
return return
def extract_string_prop(node_address, yaml, key, label, defs):
prop_def = {}
node = reduced[node_address]
prop = node['props'][key]
k = convert_string_to_label(key).upper()
prop_def[label] = "\"" + prop + "\""
if node_address in defs:
defs[node_address].update(prop_def)
else:
defs[node_address] = prop_def
return
def extract_property(node_compat, yaml, node_address, y_key, y_val, names, def extract_property(node_compat, yaml, node_address, y_key, y_val, names,
prefix, defs, label_override): prefix, defs, label_override):
@ -746,6 +764,10 @@ def main():
extract_reg_prop(chosen['zephyr,sram'], None, extract_reg_prop(chosen['zephyr,sram'], None,
defs, "CONFIG_SRAM", 1024, None) defs, "CONFIG_SRAM", 1024, None)
if 'zephyr,console' in chosen:
extract_string_prop(chosen['zephyr,console'], None, "label",
"CONFIG_UART_CONSOLE_ON_DEV_NAME", defs)
# only compute the load offset if a code partition exists and it is not the # only compute the load offset if a code partition exists and it is not the
# same as the flash base address # same as the flash base address
load_defs = {} load_defs = {}