scripts: kconfig: Prefer later defaults

This commit mirrors c6390d559f068dece53efcdadff64a40357857d7 in
Kconfiglib instead of Kconfig.

Signed-off-by: Carles Cufi <[email protected]>

kconfiglib.py

@@ -2536,7 +2536,7 @@ def str_value(self):
 
  else:
  # No user value or invalid user value. Look at defaults.
-
+ found = False
  for val_expr, cond in self.defaults:
  if expr_value(cond):
  self._write_to_conf = True
@@ -2547,9 +2547,9 @@ def str_value(self):
  val_num = int(val, base)
  else:
  val_num = 0 # strtoll() on empty string
-
- break
- else:
+ found = True
+ #break
+ if not found:
  val_num = 0 # strtoll() on empty string
 
  # This clamping procedure runs even if there's no default
@@ -2577,7 +2577,7 @@ def str_value(self):
  if expr_value(cond):
  val = val_expr.str_value
  self._write_to_conf = True
- break
+ #break
 
  # Corresponds to SYMBOL_AUTO in the C implementation
  if self.env_var is not None:
@@ -2620,7 +2620,7 @@ def tri_value(self):
  if cond_val:
  val = min(expr_value(default), cond_val)
  self._write_to_conf = True
- break
+ #break
 
  # Weak reverse dependencies are only considered if our
  # direct dependencies are met