There are a bunch of features in U-Boot that we want to enable by default, and it's best if we centralize them in one place rather than updating all the board files out there.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- note: the LMB patch should be applied before this small series to avoid conflicts -- there isnt any actual dependency on each other
v2 - rebased onto latest next
common/cmd_bootm.c | 4 ---- include/config_defaults.h | 17 +++++++++++++++++ mkconfig | 10 ++++++---- 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 include/config_defaults.h
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 22aa7f8..2101162 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_defaults.h b/include/config_defaults.h new file mode 100644 index 0000000..08b6ede --- /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 diff --git a/mkconfig b/mkconfig index bdc9d91..01e6ced 100755 --- a/mkconfig +++ b/mkconfig @@ -96,9 +96,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