michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "scripts: devicetree: Handle mixed case node names"

Browse source 
This reverts commit 1c06065941.
Breaks cc3200_launchxl really bad:

 CC      drivers/serial/uart_cc32xx.o
/projects/zephyr4/drivers/serial/uart_cc32xx.c:39:18: error: ‘TI_CC32XX_UART_4000C000_BASE_ADDRESS’ undeclared here (not in a function)
  .base = (void *)TI_CC32XX_UART_4000C000_BASE_ADDRESS,
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/projects/zephyr4/drivers/serial/uart_cc32xx.c: In function ‘uart_cc32xx_init’:
/projects/zephyr4/drivers/serial/uart_cc32xx.c:65:5: error: ‘TI_CC32XX_UART_4000C000_BAUD_RATE’ undeclared (first use in this function)
     TI_CC32XX_UART_4000C000_BAUD_RATE,
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: If46c239bc8d6b4296494f638e900f6044a92ce26
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-04-12 18:02:08 -04:00 • committed by Kumar Gala
commit 6702686976
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/devicetree.py
View file

@ -62,9 +62,9 @@ def parse_node_name(line):
label = None label = None
if addr is None: if addr is None:
return label, name.strip(), None, None return label, name.strip(), None
return label, name.strip(), addr, int(addr,16) return label, name.strip(), int(addr, 16)
def parse_values_internal(value, start, end, separator): def parse_values_internal(value, start, end, separator):
out = [] out = []
@ -142,18 +142,15 @@ def parse_property(property, fd):
def build_node_name(name, addr): def build_node_name(name, addr):
if addr is None: if addr is None:
return name return name
elif isinstance(addr, int): return '%s@%x' % (name, addr)
return '%s@%x' % (name, addr)
return '%s@%s' % (name, addr.strip())
def parse_node(line, fd): def parse_node(line, fd):
label, name, addr, numeric_addr = parse_node_name(line) label, name, addr = parse_node_name(line)
node = { node = {
'label': label, 'label': label,
'type': type, 'type': type,
'addr': numeric_addr, 'addr': addr,
'children': {}, 'children': {},
'props': {}, 'props': {},
'name': build_node_name(name, addr) 'name': build_node_name(name, addr)