29 files changed, 47 insertions, 140 deletions
diff --git a/include/aiodev.h b/include/aiodev.h
index ff877c0d78..65d817f296 100644
--- a/include/aiodev.h
+++ b/include/aiodev.h
@@ -3,9 +3,6 @@
  *
  * Copyright (c) 2015 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  * Copyright (c) 2015 Zodiac Inflight Innovation
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef __AIODEVICE_H
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 973b8b954c..76e6d0dc11 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -420,4 +420,8 @@ static inline void iowrite64be(u64 value, volatile void __iomem *addr)
 #endif
 #endif /* CONFIG_64BIT */
 
+#ifndef IOMEM
+#define IOMEM(addr)	((void __force __iomem *)(addr))
+#endif
+
 #endif /* __ASM_GENERIC_IO_H */
diff --git a/include/ata_drive.h b/include/ata_drive.h
index d98e410b30..eae74db855 100644
--- a/include/ata_drive.h
+++ b/include/ata_drive.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * See file CREDITS for list of people who contributed to this
- * project.
- */
 
 #ifndef ATA_DISK_H
 #define ATA_DISK_H
diff --git a/include/command.h b/include/command.h
index f016e35b2d..860eae3e35 100644
--- a/include/command.h
+++ b/include/command.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 /*
diff --git a/include/common.h b/include/common.h
index ef2e4e5c31..ce16ff83af 100644
--- a/include/common.h
+++ b/include/common.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef __COMMON_H_
@@ -87,7 +84,7 @@ unsigned long long strtoull_suffix(const char *str, char **endp, int base);
 extern int (*barebox_main)(void);
 
 enum autoboot_state {
-	AUTOBOOT_UNKNOWN,
+	AUTOBOOT_COUNTDOWN,
 	AUTOBOOT_ABORT,
 	AUTOBOOT_MENU,
 	AUTOBOOT_BOOT,
@@ -138,31 +135,4 @@ const char *barebox_get_hostname(void);
 void barebox_set_hostname(const char *);
 void barebox_set_hostname_no_overwrite(const char *);
 
-#ifndef IOMEM
-#define IOMEM(addr)	((void __force __iomem *)(addr))
-#endif
-
-/*
- * Check if two regions overlap. returns true if they do, false otherwise
- */
-static inline bool region_overlap(unsigned long starta, unsigned long lena,
-		unsigned long startb, unsigned long lenb)
-{
-	if (starta + lena <= startb)
-		return 0;
-	if (startb + lenb <= starta)
-		return 0;
-	return 1;
-}
-
-static inline bool lregion_overlap(loff_t starta, loff_t lena,
-				   loff_t startb, loff_t lenb)
-{
-	if (starta + lena <= startb)
-		return 0;
-	if (startb + lenb <= starta)
-		return 0;
-	return 1;
-}
-
 #endif	/* __COMMON_H_ */
diff --git a/include/console.h b/include/console.h
index 634b95ca4e..5b5c037026 100644
--- a/include/console.h
+++ b/include/console.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2000
  * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef _CONSOLE_H_
diff --git a/include/digest.h b/include/digest.h
index 6148c03da4..e4a5216964 100644
--- a/include/digest.h
+++ b/include/digest.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef __DIGEST_H__
diff --git a/include/disks.h b/include/disks.h
index e9b72c2507..1ca7063c54 100644
--- a/include/disks.h
+++ b/include/disks.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * See file CREDITS for list of people who contributed to this
- * project.
- */
 
 #ifndef DISKS_H
 #define DISKS_H
diff --git a/include/driver.h b/include/driver.h
index fac3953ef4..154525e0fd 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef DRIVER_H
diff --git a/include/environment.h b/include/environment.h
index 39606b8ad9..9488e4e1ac 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef _ENVIRONMENT_H_
diff --git a/include/hab.h b/include/hab.h
index 1aa5384053..d594ad9ee1 100644
--- a/include/hab.h
+++ b/include/hab.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2014, 2015 Marc Kleine-Budde <mkl@pengutronix.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef __HABV4_H
diff --git a/include/image.h b/include/image.h
index 18344dfef9..88b628bc75 100644
--- a/include/image.h
+++ b/include/image.h
@@ -3,9 +3,6 @@
  * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  ********************************************************************
  * NOTE: This header file defines an interface to barebox. Including
  * this (unmodified) header file in another file is considered normal
diff --git a/include/int_sqrt.h b/include/int_sqrt.h
index b06e6a8ab1..d5dfd29ca0 100644
--- a/include/int_sqrt.h
+++ b/include/int_sqrt.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * See file CREDITS for list of people who contributed to this
- * project.
- */
 
 #ifndef __INT_SQRT__
 #define __INT_SQRT__
diff --git a/include/linux/export.h b/include/linux/export.h
new file mode 100644
index 0000000000..88d318bd8a
--- /dev/null
+++ b/include/linux/export.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _LINUX_EXPORT_H
+#define _LINUX_EXPORT_H
+
+#define THIS_MODULE	0
+
+#ifdef CONFIG_MODULES
+
+struct kernel_symbol
+{
+	unsigned long value;
+	const char *name;
+};
+
+/* For every exported symbol, place a struct in the __ksymtab section */
+#define __EXPORT_SYMBOL(sym, sec)				\
+	extern typeof(sym) sym;					\
+	static const char __ustrtab_##sym[]			\
+	__attribute__((section("__usymtab_strings")))		\
+	= MODULE_SYMBOL_PREFIX #sym;                    	\
+	static const struct kernel_symbol __usymtab_##sym	\
+	__used \
+	__attribute__((section("__usymtab" sec), unused))	\
+	= { (unsigned long)&sym, __ustrtab_##sym }
+
+#define EXPORT_SYMBOL(sym)					\
+	__EXPORT_SYMBOL(sym, "")
+
+#define EXPORT_SYMBOL_GPL(sym)					\
+	__EXPORT_SYMBOL(sym, "")
+
+#else
+
+#define EXPORT_SYMBOL(sym)
+#define EXPORT_SYMBOL_GPL(sym)
+
+#endif /* CONFIG_MODULES */
+
+#endif /* _LINUX_EXPORT_H */
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index e2fe42d90e..679ce6e420 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -139,8 +139,6 @@ struct phy *of_phy_get_by_phandle(struct device_d *dev, const char *phandle,
 				  u8 index);
 void phy_put(struct phy *phy);
 struct phy *of_phy_get(struct device_node *np, const char *con_id);
-struct phy *of_phy_simple_xlate(struct device_d *dev,
-	struct of_phandle_args *args);
 struct phy *phy_create(struct device_d *dev, struct device_node *node,
 		       const struct phy_ops *ops);
 void phy_destroy(struct phy *phy);
@@ -215,12 +213,6 @@ static inline struct phy *of_phy_get(struct device_node *np, const char *con_id)
 	return ERR_PTR(-ENOSYS);
 }
 
-static inline struct phy *of_phy_simple_xlate(struct device_d *dev,
-	struct of_phandle_args *args)
-{
-	return ERR_PTR(-ENOSYS);
-}
-
 static inline struct phy *phy_create(struct device_d *dev,
 				     struct device_node *node,
 				     const struct phy_ops *ops)
diff --git a/include/mci.h b/include/mci.h
index cf9d188c5c..96547fb396 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -8,9 +8,6 @@
  * Andy Fleming
  *
  * Based (loosely) on the Linux code
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef _MCI_H_
diff --git a/include/menu.h b/include/menu.h
index 77c496c65c..bf1f6c48a8 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2009-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef __MENU_H__
diff --git a/include/mfd/mc13892.h b/include/mfd/mc13892.h
index e9a41ba214..a647bf34bc 100644
--- a/include/mfd/mc13892.h
+++ b/include/mfd/mc13892.h
@@ -4,9 +4,6 @@
  *
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
diff --git a/include/module.h b/include/module.h
index abf740a789..cea8c2e181 100644
--- a/include/module.h
+++ b/include/module.h
@@ -4,6 +4,7 @@
 
 #include <elf.h>
 #include <linux/compiler.h>
+#include <linux/export.h>
 #include <linux/list.h>
 
 #ifndef MODULE_SYMBOL_PREFIX
@@ -11,36 +12,12 @@
 #endif
 
 #define MODULE_NAME_LEN (64 - sizeof(unsigned long))
-#define THIS_MODULE	0
 
 #ifdef CONFIG_MODULES
 #include <asm/module.h>
 
-struct kernel_symbol
-{
-	unsigned long value;
-	const char *name;
-};
-
 struct module * load_module(void *mod_image, unsigned long len);
 
-/* For every exported symbol, place a struct in the __ksymtab section */
-#define __EXPORT_SYMBOL(sym, sec)				\
-	extern typeof(sym) sym;					\
-	static const char __ustrtab_##sym[]			\
-	__attribute__((section("__usymtab_strings")))		\
-	= MODULE_SYMBOL_PREFIX #sym;                    	\
-	static const struct kernel_symbol __usymtab_##sym	\
-	__used \
-	__attribute__((section("__usymtab" sec), unused))	\
-	= { (unsigned long)&sym, __ustrtab_##sym }
-
-#define EXPORT_SYMBOL(sym)					\
-	__EXPORT_SYMBOL(sym, "")
-
-#define EXPORT_SYMBOL_GPL(sym)					\
-	__EXPORT_SYMBOL(sym, "")
-
 struct module {
 	/* Unique handle for this module */
 	char name[MODULE_NAME_LEN];
@@ -74,9 +51,6 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
 		       unsigned int symindex,
 		       unsigned int relsec,
 		       struct module *mod);
-#else
-#define EXPORT_SYMBOL(sym)
-#define EXPORT_SYMBOL_GPL(sym)
 #endif /* CONFIG_MODULES */
 
 extern struct list_head module_list;
diff --git a/include/of.h b/include/of.h
index 85d55f9b57..08bbeaf4d2 100644
--- a/include/of.h
+++ b/include/of.h
@@ -79,8 +79,8 @@ struct fdt_header *of_get_fixed_tree(struct device_node *node);
 static inline u64 of_read_number(const __be32 *cell, int size)
 {
 	u64 r = 0;
-	while (size--)
-		r = (r << 32) | be32_to_cpu(*(cell++));
+	for (; size--; cell++)
+		r = (r << 32) | be32_to_cpu(*cell);
 	return r;
 }
 
diff --git a/include/part.h b/include/part.h
index 66cc93ae96..e98647c70c 100644
--- a/include/part.h
+++ b/include/part.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 #ifndef _PART_H
 #define _PART_H
diff --git a/include/password.h b/include/password.h
index e259a87da1..9569547002 100644
--- a/include/password.h
+++ b/include/password.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 #ifndef __PASSWORD_H__
diff --git a/include/platform_data/ide.h b/include/platform_data/ide.h
index f71fbfbc01..e7aaf2fda7 100644
--- a/include/platform_data/ide.h
+++ b/include/platform_data/ide.h
@@ -1,7 +1,4 @@
 /*
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
diff --git a/include/rtc.h b/include/rtc.h
index 3190ea20da..d7e103d163 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 /*
diff --git a/include/s_record.h b/include/s_record.h
index 190850beed..096b04da6e 100644
--- a/include/s_record.h
+++ b/include/s_record.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
 
 /*--------------------------------------------------------------------------
diff --git a/include/scsi.h b/include/scsi.h
index ede1907962..e2397489ea 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -2,9 +2,6 @@
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
- *
- * See file CREDITS for list of people who contributed to this
- * project.
  */
  #ifndef _SCSI_H
  #define _SCSI_H
diff --git a/include/serial/lpuart.h b/include/serial/lpuart.h
index 9c6e271ebf..3ced2cd6b2 100644
--- a/include/serial/lpuart.h
+++ b/include/serial/lpuart.h
@@ -4,9 +4,6 @@
  *
  * Based on code found in Linux kernel and U-Boot.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
  * as published by the Free Software Foundation.
diff --git a/include/usb/usb.h b/include/usb/usb.h
index 82a4736445..c2085eae87 100644
--- a/include/usb/usb.h
+++ b/include/usb/usb.h
@@ -2,9 +2,6 @@
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
diff --git a/include/usb/usb_defs.h b/include/usb/usb_defs.h
index cfde278a33..731bc51c76 100644
--- a/include/usb/usb_defs.h
+++ b/include/usb/usb_defs.h
@@ -2,9 +2,6 @@
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of