<div dir="ltr">Fixes build issues I reported. Please push.<div><br></div><div>--joel</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jun 13, 2022 at 2:18 AM Christian Mauderer <<a href="mailto:christian.mauderer@embedded-brains.de">christian.mauderer@embedded-brains.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The patch "bsps/atsam: Fix type of options" missed to adapt some parts<br>
of the yml. With that a custom value works well. But if no value is set,<br>
configure doesn't fall back to the default value but instead just causes<br>
an error. This patch fixes that.<br>
---<br>
spec/build/bsps/arm/atsam/optconidx.yml | 3 ++-<br>
spec/build/bsps/arm/atsam/optcontype.yml | 3 ++-<br>
2 files changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/spec/build/bsps/arm/atsam/optconidx.yml b/spec/build/bsps/arm/atsam/optconidx.yml<br>
index 1c0723c594..d58d75e4aa 100644<br>
--- a/spec/build/bsps/arm/atsam/optconidx.yml<br>
+++ b/spec/build/bsps/arm/atsam/optconidx.yml<br>
@@ -1,7 +1,7 @@<br>
SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
actions:<br>
- get-integer: null<br>
-- define-condition: null<br>
+- define: null<br>
build-type: option<br>
copyrights:<br>
- Copyright (C) 2020 embedded brains GmbH (<a href="http://www.embedded-brains.de" rel="noreferrer" target="_blank">http://www.embedded-brains.de</a>)<br>
@@ -10,6 +10,7 @@ default-by-variant: []<br>
description: |<br>
device index for /dev/console (default 1, e.g. USART1)<br>
enabled-by: true<br>
+format: '{}'<br>
links: []<br>
name: ATSAM_CONSOLE_DEVICE_INDEX<br>
type: build<br>
diff --git a/spec/build/bsps/arm/atsam/optcontype.yml b/spec/build/bsps/arm/atsam/optcontype.yml<br>
index fd0daa8999..6846fed5f2 100644<br>
--- a/spec/build/bsps/arm/atsam/optcontype.yml<br>
+++ b/spec/build/bsps/arm/atsam/optcontype.yml<br>
@@ -1,7 +1,7 @@<br>
SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
actions:<br>
- get-integer: null<br>
-- define-condition: null<br>
+- define: null<br>
build-type: option<br>
copyrights:<br>
- Copyright (C) 2020 embedded brains GmbH (<a href="http://www.embedded-brains.de" rel="noreferrer" target="_blank">http://www.embedded-brains.de</a>)<br>
@@ -10,6 +10,7 @@ default-by-variant: []<br>
description: |<br>
device type for /dev/console, use 0 for USART and 1 for UART (default USART)<br>
enabled-by: true<br>
+format: '{}'<br>
links: []<br>
name: ATSAM_CONSOLE_DEVICE_TYPE<br>
type: build<br>
-- <br>
2.35.3<br>
<br>
</blockquote></div>