diff options
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 32 |
1 files changed, 1 insertions, 31 deletions
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_ */ |