diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-12-02 21:15:03 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-18 00:04:42 +0100 |
| commit | 10c32ff59f7abe352b548066918bc5ea39e7c47b (patch) | |
| tree | 080aea94c21b3c09d3664d326ae855a02df56a82 | |
| parent | 3e3989619f5ed3ee28002d985f3da28540586ab9 (diff) | |
| download | u-boot-imx-10c32ff59f7abe352b548066918bc5ea39e7c47b.zip u-boot-imx-10c32ff59f7abe352b548066918bc5ea39e7c47b.tar.gz u-boot-imx-10c32ff59f7abe352b548066918bc5ea39e7c47b.tar.bz2 | |
config_defaults.h: new header for common u-boot config defaults
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>
| -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 94ddac3..0ef3e5e 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 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 @@ -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 |