diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
| commit | a3e62ffc7341254fd754886e560865556bc731c8 (patch) | |
| tree | 927d7536f9a66998b807d8943b05f3242dab6dd2 /include | |
| parent | a6aab0ebab471e91beb4e14c2d305b326ac18928 (diff) | |
| parent | d15760e59897f71252294b2bea8fe986efdcb1b8 (diff) | |
| download | barebox-a3e62ffc7341254fd754886e560865556bc731c8.tar.gz barebox-a3e62ffc7341254fd754886e560865556bc731c8.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'include')
| -rw-r--r-- | include/filetype.h | 1 | ||||
| -rw-r--r-- | include/gpio.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/filetype.h b/include/filetype.h index f1be04e816..90a03de581 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -48,6 +48,7 @@ enum filetype { filetype_layerscape_image, filetype_layerscape_qspi_image, filetype_ubootvar, + filetype_stm32_image_v1, filetype_max, }; diff --git a/include/gpio.h b/include/gpio.h index e822fd5347..1926edeca7 100644 --- a/include/gpio.h +++ b/include/gpio.h @@ -45,7 +45,11 @@ static inline int gpio_direction_active(unsigned gpio, int value) } #endif +#if defined(CONFIG_ARCH_NR_GPIO) && CONFIG_ARCH_NR_GPIO > 0 +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO +#else #define ARCH_NR_GPIOS 256 +#endif static inline int gpio_is_valid(int gpio) { |