bootentries: Move struct bootentries to include/boot.h
The boot function prototypes are declared in include/blspec.h. Move them to include/boot.h where they belong. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
3ab18b3cd0
commit
bf07b3411a
|
@ -2,21 +2,7 @@
|
||||||
#define __LOADER_H__
|
#define __LOADER_H__
|
||||||
|
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <menu.h>
|
#include <boot.h>
|
||||||
|
|
||||||
struct bootentries {
|
|
||||||
struct list_head entries;
|
|
||||||
struct menu *menu;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct bootentry {
|
|
||||||
struct list_head list;
|
|
||||||
struct menu_entry me;
|
|
||||||
char *title;
|
|
||||||
char *description;
|
|
||||||
int (*boot)(struct bootentry *entry, int verbose, int dryrun);
|
|
||||||
void (*release)(struct bootentry *entry);
|
|
||||||
};
|
|
||||||
|
|
||||||
struct blspec_entry {
|
struct blspec_entry {
|
||||||
struct bootentry entry;
|
struct bootentry entry;
|
||||||
|
@ -37,9 +23,4 @@ int blspec_scan_device(struct bootentries *bootentries, struct device_d *dev);
|
||||||
int blspec_scan_devicename(struct bootentries *bootentries, const char *devname);
|
int blspec_scan_devicename(struct bootentries *bootentries, const char *devname);
|
||||||
int blspec_scan_directory(struct bootentries *bootentries, const char *root);
|
int blspec_scan_directory(struct bootentries *bootentries, const char *root);
|
||||||
|
|
||||||
int bootentries_add_entry(struct bootentries *entries, struct bootentry *entry);
|
|
||||||
|
|
||||||
#define bootentries_for_each_entry(bootentries, entry) \
|
|
||||||
list_for_each_entry(entry, &bootentries->entries, list)
|
|
||||||
|
|
||||||
#endif /* __LOADER_H__ */
|
#endif /* __LOADER_H__ */
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#define __BOOT_H
|
#define __BOOT_H
|
||||||
|
|
||||||
#include <of.h>
|
#include <of.h>
|
||||||
|
#include <menu.h>
|
||||||
#include <environment.h>
|
#include <environment.h>
|
||||||
|
|
||||||
#ifdef CONFIG_FLEXIBLE_BOOTARGS
|
#ifdef CONFIG_FLEXIBLE_BOOTARGS
|
||||||
|
@ -19,4 +20,23 @@ static inline int linux_bootargs_overwrite(const char *bootargs)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
struct bootentries {
|
||||||
|
struct list_head entries;
|
||||||
|
struct menu *menu;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct bootentry {
|
||||||
|
struct list_head list;
|
||||||
|
struct menu_entry me;
|
||||||
|
char *title;
|
||||||
|
char *description;
|
||||||
|
int (*boot)(struct bootentry *entry, int verbose, int dryrun);
|
||||||
|
void (*release)(struct bootentry *entry);
|
||||||
|
};
|
||||||
|
|
||||||
|
int bootentries_add_entry(struct bootentries *entries, struct bootentry *entry);
|
||||||
|
|
||||||
|
#define bootentries_for_each_entry(bootentries, entry) \
|
||||||
|
list_for_each_entry(entry, &bootentries->entries, list)
|
||||||
|
|
||||||
#endif /* __BOOT_H */
|
#endif /* __BOOT_H */
|
||||||
|
|
Loading…
Reference in New Issue