diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-22 22:35:44 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-22 22:35:44 +0200 |
commit | d1475d8aab7a6ab7ea7534a98bd20e59f150c2e3 (patch) | |
tree | 9cba64584a5b520e8074c722f662d27387f2fd84 /include/common.h | |
parent | 0cc89de8ef60214083739904b011f6c255922723 (diff) | |
parent | 800eb09641ae67c707b65acff112684a954b7f44 (diff) | |
download | u-boot-imx-d1475d8aab7a6ab7ea7534a98bd20e59f150c2e3.zip u-boot-imx-d1475d8aab7a6ab7ea7534a98bd20e59f150c2e3.tar.gz u-boot-imx-d1475d8aab7a6ab7ea7534a98bd20e59f150c2e3.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include/common.h')
-rw-r--r-- | include/common.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 6a79ec2..b7193e6 100644 --- a/include/common.h +++ b/include/common.h @@ -585,8 +585,6 @@ uint dpram_base(void); uint dpram_base_align(uint align); uint dpram_alloc(uint size); uint dpram_alloc_align(uint size,uint align); -void post_word_store (ulong); -ulong post_word_load (void); void bootcount_store (ulong); ulong bootcount_load (void); #define BOOTCOUNT_MAGIC 0xB001C041 @@ -727,6 +725,9 @@ int cpu_release(int nr, int argc, char * const argv[]); #ifdef CONFIG_POST #define CONFIG_HAS_POST +#ifndef CONFIG_POST_ALT_LIST +#define CONFIG_POST_STD_LIST +#endif #endif #ifdef CONFIG_INIT_CRITICAL |