diff options
| -rw-r--r-- | common/cmd_bootm.c | 4 | ||||
| -rw-r--r-- | include/config_defaults.h | 17 | ||||
| -rwxr-xr-x | mkconfig | 10 |
3 files changed, 23 insertions, 8 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 94ddac37cf..0ef3e5ebc6 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -105,10 +105,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_defaults.h b/include/config_defaults.h new file mode 100644 index 0000000000..08b6edec4e --- /dev/null +++ b/include/config_defaults.h @@ -0,0 +1,17 @@ +/* + * config_defaults.h - sane defaults for everyone + * + * Copyright (c) 2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef _CONFIG_DEFAULTS_H_ +#define _CONFIG_DEFAULTS_H_ + +/* Support bootm-ing different OSes */ +#define CONFIG_BOOTM_LINUX 1 +#define CONFIG_BOOTM_NETBSD 1 +#define CONFIG_BOOTM_RTEMS 1 + +#endif @@ -101,9 +101,11 @@ for i in ${TARGETS} ; do echo "#define CONFIG_MK_${i} 1" >>config.h ; done -echo "#define CONFIG_BOARDDIR board/$BOARDDIR" >>config.h - -echo "#include <configs/$1.h>" >>config.h -echo "#include <asm/config.h>" >>config.h +cat << EOF >> config.h +#define CONFIG_BOARDDIR board/$BOARDDIR +#include <config_defaults.h> +#include <configs/$1.h> +#include <asm/config.h> +EOF exit 0 |