Convert CONFIG_BOOTCOUNT_EXT to Kconfig

[people/ms/u-boot.git] / scripts / dtc / util.h

diff --git a/scripts/dtc/util.h b/scripts/dtc/util.h
index bc3d223fa6e3ea9368825223fff42e75d8c5214a..ad5f41199edbb74f3bdb97bdfc908caab6145571 100644 (file)
--- a/scripts/dtc/util.h
+++ b/scripts/dtc/util.h
@@ -25,15 +25,17 @@
  *                                                                   USA
  */
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 #ifdef __GNUC__
-static inline void
-__attribute__((noreturn)) __attribute__((format (printf, 1, 2)))
-die(const char *str, ...)
+#define PRINTF(i, j)   __attribute__((format (printf, i, j)))
+#define NORETURN       __attribute__((noreturn))
 #else
-static inline void die(const char *str, ...)
+#define PRINTF(i, j)
+#define NORETURN
 #endif
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+static inline void NORETURN PRINTF(1, 2) die(const char *str, ...)
 {
        va_list ap;
 
@@ -66,12 +68,7 @@ static inline void *xrealloc(void *p, size_t len)
 
 extern char *xstrdup(const char *s);
 
-#ifdef __GNUC__
-extern int __attribute__((format (printf, 2, 3)))
-xasprintf(char **strp, const char *fmt, ...);
-#else
-extern int xasprintf(char **strp, const char *fmt, ...);
-#endif
+extern int PRINTF(2, 3) xasprintf(char **strp, const char *fmt, ...);
 extern char *join_path(const char *path, const char *name);
 
 /**
@@ -200,7 +197,7 @@ void utilfdt_print_data(const char *data, int len);
 /**
  * Show source version and exit
  */
-void util_version(void) __attribute__((noreturn));
+void NORETURN util_version(void);
 
 /**
  * Show usage and exit
@@ -214,9 +211,10 @@ void util_version(void) __attribute__((noreturn));
  * @param long_opts    The structure of long options
  * @param opts_help    An array of help strings (should align with long_opts)
  */
-void util_usage(const char *errmsg, const char *synopsis,
-               const char *short_opts, struct option const long_opts[],
-               const char * const opts_help[]) __attribute__((noreturn));
+void NORETURN util_usage(const char *errmsg, const char *synopsis,
+                        const char *short_opts,
+                        struct option const long_opts[],
+                        const char * const opts_help[]);
 
 /**
  * Show usage and exit