Thanks. I pushed it.

Am 13.06.22 um 19:37 schrieb Joel Sherrill:
Fixes build issues I reported. Please push.

--joel

On Mon, Jun 13, 2022 at 2:18 AM Christian Mauderer <christian.maude...@embedded-brains.de <mailto:christian.maude...@embedded-brains.de>> wrote:

    The patch "bsps/atsam: Fix type of options" missed to adapt some parts
    of the yml. With that a custom value works well. But if no value is set,
    configure doesn't fall back to the default value but instead just causes
    an error. This patch fixes that.
    ---
      spec/build/bsps/arm/atsam/optconidx.yml  | 3 ++-
      spec/build/bsps/arm/atsam/optcontype.yml | 3 ++-
      2 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/spec/build/bsps/arm/atsam/optconidx.yml
    b/spec/build/bsps/arm/atsam/optconidx.yml
    index 1c0723c594..d58d75e4aa 100644
    --- a/spec/build/bsps/arm/atsam/optconidx.yml
    +++ b/spec/build/bsps/arm/atsam/optconidx.yml
    @@ -1,7 +1,7 @@
      SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
      actions:
      - get-integer: null
    -- define-condition: null
    +- define: null
      build-type: option
      copyrights:
      - Copyright (C) 2020 embedded brains GmbH
    (http://www.embedded-brains.de <http://www.embedded-brains.de>)
    @@ -10,6 +10,7 @@ default-by-variant: []
      description: |
        device index for /dev/console (default 1, e.g. USART1)
      enabled-by: true
    +format: '{}'
      links: []
      name: ATSAM_CONSOLE_DEVICE_INDEX
      type: build
    diff --git a/spec/build/bsps/arm/atsam/optcontype.yml
    b/spec/build/bsps/arm/atsam/optcontype.yml
    index fd0daa8999..6846fed5f2 100644
    --- a/spec/build/bsps/arm/atsam/optcontype.yml
    +++ b/spec/build/bsps/arm/atsam/optcontype.yml
    @@ -1,7 +1,7 @@
      SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
      actions:
      - get-integer: null
    -- define-condition: null
    +- define: null
      build-type: option
      copyrights:
      - Copyright (C) 2020 embedded brains GmbH
    (http://www.embedded-brains.de <http://www.embedded-brains.de>)
    @@ -10,6 +10,7 @@ default-by-variant: []
      description: |
        device type for /dev/console, use 0 for USART and 1 for UART
    (default USART)
      enabled-by: true
    +format: '{}'
      links: []
      name: ATSAM_CONSOLE_DEVICE_TYPE
      type: build
-- 2.35.3


--
--------------------------------------------
embedded brains GmbH
Herr Christian MAUDERER
Dornierstr. 4
82178 Puchheim
Germany
email:  christian.maude...@embedded-brains.de
phone:  +49-89-18 94 741 - 18
mobile: +49-176-152 206 08

Registergericht: Amtsgericht München
Registernummer: HRB 157899
Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler
Unsere Datenschutzerklärung finden Sie hier:
https://embedded-brains.de/datenschutzerklaerung/
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to