diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:57:35 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:57:35 +0200 |
| commit | 9dd5dad88777a7c6a63f8c103706b57364a135f4 (patch) | |
| tree | 20af70ec3c451858855478e720498be0b5a800a4 /include | |
| parent | d7eb184af828ebde3834af2a0d54421fd1a57f63 (diff) | |
| parent | 6801201ee72795dddb1e23aa6091c95866b19e0b (diff) | |
| download | u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.zip u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.tar.gz u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.tar.bz2 | |
Merge branch 'misc' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_cmd_defaults.h | 6 | ||||
| -rw-r--r-- | include/config_defaults.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h index 9283daa..a55b268 100644 --- a/include/config_cmd_defaults.h +++ b/include/config_cmd_defaults.h @@ -1,7 +1,7 @@ /* * config_cmd_defaults.h - sane defaults for everyone * - * Copyright (c) 2010 Analog Devices Inc. + * Copyright (c) 2010-2011 Analog Devices Inc. * * Licensed under the GPL-2 or later. */ @@ -10,5 +10,9 @@ #define _CONFIG_CMD_DEFAULTS_H_ #define CONFIG_CMD_BOOTM 1 +#define CONFIG_CMD_CRC32 1 +#define CONFIG_CMD_EXPORTENV 1 +#define CONFIG_CMD_GO 1 +#define CONFIG_CMD_IMPORTENV 1 #endif diff --git a/include/config_defaults.h b/include/config_defaults.h index abdf3be..0337163 100644 --- a/include/config_defaults.h +++ b/include/config_defaults.h @@ -12,7 +12,6 @@ /* Support bootm-ing different OSes */ #define CONFIG_BOOTM_LINUX 1 #define CONFIG_BOOTM_NETBSD 1 -#define CONFIG_BOOTM_OSE 1 #define CONFIG_BOOTM_RTEMS 1 #define CONFIG_GZIP 1 |