Rather than declare default bootm OS support options in cmd_bootm.c where boards cannot override it, move the options to config_cmd_default.h. Now boards that want to disable certain default OS's can do just that.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- common/cmd_bootm.c | 4 ---- include/config_cmd_default.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 365ceeb..a2e8456 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -102,10 +102,6 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); typedef int boot_os_fn (int flag, int argc, char *argv[], bootm_headers_t *images); /* pointers to os/initrd/fdt */
-#define CONFIG_BOOTM_LINUX 1 -#define CONFIG_BOOTM_NETBSD 1 -#define CONFIG_BOOTM_RTEMS 1 - #ifdef CONFIG_BOOTM_LINUX extern boot_os_fn do_bootm_linux; #endif diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h index a5d87a6..a28ad4d 100644 --- a/include/config_cmd_default.h +++ b/include/config_cmd_default.h @@ -39,4 +39,8 @@ #define CONFIG_CMD_SOURCE /* "source" command support */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */
+#define CONFIG_BOOTM_LINUX +#define CONFIG_BOOTM_NETBSD +#define CONFIG_BOOTM_RTEMS + #endif /* _CONFIG_CMD_DEFAULT_H */