diff options
author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/post.h | |
parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/post.h')
-rw-r--r-- | include/post.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/include/post.h b/include/post.h index 123623f..97583b7 100644 --- a/include/post.h +++ b/include/post.h @@ -82,28 +82,28 @@ extern int post_hotkeys_pressed(void); #endif /* __ASSEMBLY__ */ -#define CFG_POST_RTC 0x00000001 -#define CFG_POST_WATCHDOG 0x00000002 -#define CFG_POST_MEMORY 0x00000004 -#define CFG_POST_CPU 0x00000008 -#define CFG_POST_I2C 0x00000010 -#define CFG_POST_CACHE 0x00000020 -#define CFG_POST_UART 0x00000040 -#define CFG_POST_ETHER 0x00000080 -#define CFG_POST_SPI 0x00000100 -#define CFG_POST_USB 0x00000200 -#define CFG_POST_SPR 0x00000400 -#define CFG_POST_SYSMON 0x00000800 -#define CFG_POST_DSP 0x00001000 -#define CFG_POST_OCM 0x00002000 -#define CFG_POST_FPU 0x00004000 -#define CFG_POST_ECC 0x00008000 -#define CFG_POST_BSPEC1 0x00010000 -#define CFG_POST_BSPEC2 0x00020000 -#define CFG_POST_BSPEC3 0x00040000 -#define CFG_POST_BSPEC4 0x00080000 -#define CFG_POST_BSPEC5 0x00100000 -#define CFG_POST_CODEC 0x00200000 +#define CONFIG_SYS_POST_RTC 0x00000001 +#define CONFIG_SYS_POST_WATCHDOG 0x00000002 +#define CONFIG_SYS_POST_MEMORY 0x00000004 +#define CONFIG_SYS_POST_CPU 0x00000008 +#define CONFIG_SYS_POST_I2C 0x00000010 +#define CONFIG_SYS_POST_CACHE 0x00000020 +#define CONFIG_SYS_POST_UART 0x00000040 +#define CONFIG_SYS_POST_ETHER 0x00000080 +#define CONFIG_SYS_POST_SPI 0x00000100 +#define CONFIG_SYS_POST_USB 0x00000200 +#define CONFIG_SYS_POST_SPR 0x00000400 +#define CONFIG_SYS_POST_SYSMON 0x00000800 +#define CONFIG_SYS_POST_DSP 0x00001000 +#define CONFIG_SYS_POST_OCM 0x00002000 +#define CONFIG_SYS_POST_FPU 0x00004000 +#define CONFIG_SYS_POST_ECC 0x00008000 +#define CONFIG_SYS_POST_BSPEC1 0x00010000 +#define CONFIG_SYS_POST_BSPEC2 0x00020000 +#define CONFIG_SYS_POST_BSPEC3 0x00040000 +#define CONFIG_SYS_POST_BSPEC4 0x00080000 +#define CONFIG_SYS_POST_BSPEC5 0x00100000 +#define CONFIG_SYS_POST_CODEC 0x00200000 #endif /* CONFIG_POST */ |