From b4e18072a895ae78f3ee954bb66c9c5a4f0b6e61 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Mon, 23 Dec 2019 11:07:27 +0100 Subject: [PATCH] kconfig: Fix wrong max argument count for some preprocessor functions dt_chosen_reg() and dt_node_reg() take between 1 and 3 arguments, not between 1 and 4 arguments. The implicit name argument isn't included in the count. These functions implement $(dt_chosen_reg_*) and $(dt_node_reg_*). Giving the right max argument count makes Kconfiglib generate error messages that give the location of the call, instead of getting a cryptic generic Python error. Signed-off-by: Ulf Magnusson --- scripts/kconfig/kconfigfunctions.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/kconfig/kconfigfunctions.py b/scripts/kconfig/kconfigfunctions.py index 1111d4a93d8..ec51ec5d22f 100644 --- a/scripts/kconfig/kconfigfunctions.py +++ b/scripts/kconfig/kconfigfunctions.py @@ -356,14 +356,14 @@ functions = { "dt_compat_enabled": (dt_compat_enabled, 1, 1), "dt_chosen_label": (dt_chosen_label, 1, 1), "dt_chosen_enabled": (dt_chosen_enabled, 1, 1), - "dt_chosen_reg_addr_int": (dt_chosen_reg, 1, 4), - "dt_chosen_reg_addr_hex": (dt_chosen_reg, 1, 4), - "dt_chosen_reg_size_int": (dt_chosen_reg, 1, 4), - "dt_chosen_reg_size_hex": (dt_chosen_reg, 1, 4), - "dt_node_reg_addr_int": (dt_node_reg, 1, 4), - "dt_node_reg_addr_hex": (dt_node_reg, 1, 4), - "dt_node_reg_size_int": (dt_node_reg, 1, 4), - "dt_node_reg_size_hex": (dt_node_reg, 1, 4), + "dt_chosen_reg_addr_int": (dt_chosen_reg, 1, 3), + "dt_chosen_reg_addr_hex": (dt_chosen_reg, 1, 3), + "dt_chosen_reg_size_int": (dt_chosen_reg, 1, 3), + "dt_chosen_reg_size_hex": (dt_chosen_reg, 1, 3), + "dt_node_reg_addr_int": (dt_node_reg, 1, 3), + "dt_node_reg_addr_hex": (dt_node_reg, 1, 3), + "dt_node_reg_size_int": (dt_node_reg, 1, 3), + "dt_node_reg_size_hex": (dt_node_reg, 1, 3), "dt_node_has_bool_prop": (dt_node_has_bool_prop, 2, 2), "shields_list_contains": (shields_list_contains, 1, 1), }