diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 15 | ||||
| -rw-r--r-- | common/env_common.c | 2 | ||||
| -rw-r--r-- | common/env_flags.c | 1 |
3 files changed, 2 insertions, 16 deletions
diff --git a/common/board_f.c b/common/board_f.c index ff078866655..d9431ee79a8 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -146,13 +146,6 @@ static int announce_dram_init(void) return 0; } -#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_M68K) -static int init_func_ram(void) -{ - return initdram(); -} -#endif - static int show_dram_config(void) { unsigned long long size; @@ -779,15 +772,7 @@ static const init_fnc_t init_sequence_f[] = { init_func_spi, #endif announce_dram_init, - /* TODO: unify all these dram functions? */ -#if defined(CONFIG_ARM) || defined(CONFIG_X86) || defined(CONFIG_NDS32) || \ - defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) || \ - defined(CONFIG_SH) dram_init, /* configure available RAM banks */ -#endif -#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_M68K) - init_func_ram, -#endif #ifdef CONFIG_POST post_init_f, #endif diff --git a/common/env_common.c b/common/env_common.c index 7fb62e8b457..6845f8d8d54 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -140,7 +140,7 @@ int set_default_vars(int nvars, char * const vars[]) } #ifdef CONFIG_ENV_AES -#include <aes.h> +#include <uboot_aes.h> /** * env_aes_cbc_get_key() - Get AES-128-CBC key for the environment * diff --git a/common/env_flags.c b/common/env_flags.c index 921d3770ead..3c50620cb34 100644 --- a/common/env_flags.c +++ b/common/env_flags.c @@ -11,6 +11,7 @@ #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */ #include <stdint.h> #include <stdio.h> +#include "fw_env_private.h" #include "fw_env.h" #include <env_attr.h> #include <env_flags.h> |