projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
ubi_uboot.h
diff --git
a/include/ubi_uboot.h
b/include/ubi_uboot.h
index
b415219
..
69006e2
100644
(file)
--- a/
include/ubi_uboot.h
+++ b/
include/ubi_uboot.h
@@
-15,10
+15,16
@@
#define __UBOOT_UBI_H
#include <common.h>
#define __UBOOT_UBI_H
#include <common.h>
+#include <compiler.h>
#include <malloc.h>
#include <div64.h>
#include <linux/crc32.h>
#include <malloc.h>
#include <div64.h>
#include <linux/crc32.h>
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/rbtree.h>
+#include <linux/string.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd.h>
+#include <linux/mtd/ubi.h>
#ifdef CONFIG_CMD_ONENAND
#include <onenand_uboot.h>
#ifdef CONFIG_CMD_ONENAND
#include <onenand_uboot.h>
@@
-46,9
+52,6
@@
do { \
#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
#define CONFIG_MTD_UBI_DEBUG_DISABLE_BGT
#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
#define CONFIG_MTD_UBI_DEBUG_DISABLE_BGT
-/* compiler options */
-#define uninitialized_var(x) x = x
-
/* build.c */
#define get_device(...)
#define put_device(...)
/* build.c */
#define get_device(...)
#define put_device(...)
@@
-120,7
+123,7
@@
typedef int wait_queue_head_t;
#define init_rwsem(...) do { } while (0)
#define down_read(...) do { } while (0)
#define down_write(...) do { } while (0)
#define init_rwsem(...) do { } while (0)
#define down_read(...) do { } while (0)
#define down_write(...) do { } while (0)
-#define down_write_trylock(...)
0
+#define down_write_trylock(...)
1
#define up_read(...) do { } while (0)
#define up_write(...) do { } while (0)
#define up_read(...) do { } while (0)
#define up_write(...) do { } while (0)
@@
-188,12
+191,9
@@
static inline long IS_ERR(const void *ptr)
return IS_ERR_VALUE((unsigned long)ptr);
}
return IS_ERR_VALUE((unsigned long)ptr);
}
-/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
/* module */
#define THIS_MODULE 0
/* module */
#define THIS_MODULE 0
-#define try_module_get(...)
0
+#define try_module_get(...)
1
#define module_put(...) do { } while (0)
#define module_init(...)
#define module_exit(...)
#define module_put(...) do { } while (0)
#define module_init(...)
#define module_exit(...)
@@
-206,7
+206,9
@@
static inline long IS_ERR(const void *ptr)
#define MODULE_AUTHOR(...)
#define MODULE_LICENSE(...)
#define MODULE_AUTHOR(...)
#define MODULE_LICENSE(...)
+#ifndef __UBIFS_H__
#include "../drivers/mtd/ubi/ubi.h"
#include "../drivers/mtd/ubi/ubi.h"
+#endif
/* functions */
extern int ubi_mtd_param_parse(const char *val, struct kernel_param *kp);
/* functions */
extern int ubi_mtd_param_parse(const char *val, struct kernel_param *kp);