diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-01 21:42:21 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-01 21:42:21 +0200 |
| commit | 97d7ab8a8eb6dbf7c9e8096f31031dfed81db8f8 (patch) | |
| tree | ee8afc46f2b1db1d875951f5641e4b917c85fe39 /include | |
| parent | af708cbaae3c7254a50aee333b860dffc78db45d (diff) | |
| parent | 90a75b050b8a23a6e8f558cc9a76658d8443509d (diff) | |
| download | u-boot-imx-97d7ab8a8eb6dbf7c9e8096f31031dfed81db8f8.zip u-boot-imx-97d7ab8a8eb6dbf7c9e8096f31031dfed81db8f8.tar.gz u-boot-imx-97d7ab8a8eb6dbf7c9e8096f31031dfed81db8f8.tar.bz2 | |
Merge branch 'post' of git://git.denx.de/u-boot-blackfin
* 'post' of git://git.denx.de/u-boot-blackfin:
Blackfin: uart: implement loop callback for post
Blackfin: bf537-stamp/bf548-ezkit: update POST flash block range
Blackfin: post: generalize led/button tests with GPIOs
Blackfin: bf537-stamp: drop uart/flash post tests
Blackfin: post: drop custom test list
Blackfin: bf537-stamp: convert to gpio post hotkey
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/bf537-stamp.h | 11 | ||||
| -rw-r--r-- | include/configs/bf548-ezkit.h | 10 | ||||
| -rw-r--r-- | include/configs/bfin_adi_common.h | 1 |
3 files changed, 17 insertions, 5 deletions
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index da14a4f..1a7273b 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -257,8 +257,15 @@ /* Define if want to do post memory test */ #undef CONFIG_POST #ifdef CONFIG_POST -#define FLASH_START_POST_BLOCK 11 /* Should > = 11 */ -#define FLASH_END_POST_BLOCK 71 /* Should < = 71 */ +#define CONFIG_SYS_POST_HOTKEYS_GPIO GPIO_PF5 +#define CONFIG_POST_BSPEC1_GPIO_LEDS \ + GPIO_PF6, GPIO_PF7, GPIO_PF8, GPIO_PF9, GPIO_PF10, GPIO_PF11, +#define CONFIG_POST_BSPEC2_GPIO_BUTTONS \ + GPIO_PF5, GPIO_PF4, GPIO_PF3, GPIO_PF2, +#define CONFIG_POST_BSPEC2_GPIO_NAMES \ + 10, 11, 12, 13, +#define CONFIG_SYS_POST_FLASH_START 11 +#define CONFIG_SYS_POST_FLASH_END 71 #endif /* These are for board tests */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 3550fd3..4862baa 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -197,8 +197,14 @@ /* Define if want to do post memory test */ #undef CONFIG_POST #ifdef CONFIG_POST -#define FLASH_START_POST_BLOCK 11 /* Should > = 11 */ -#define FLASH_END_POST_BLOCK 71 /* Should < = 71 */ +#define CONFIG_POST_BSPEC1_GPIO_LEDS \ + GPIO_PG6, GPIO_PG7, GPIO_PG8, GPIO_PG9, GPIO_PG10, GPIO_PG11, +#define CONFIG_POST_BSPEC2_GPIO_BUTTONS \ + GPIO_PB8, GPIO_PB9, GPIO_PB10, GPIO_PB11 +#define CONFIG_POST_BSPEC2_GPIO_NAMES \ + 13, 12, 11, 10, +#define CONFIG_SYS_POST_FLASH_START 10 +#define CONFIG_SYS_POST_FLASH_END 127 #endif diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 57d9b97..bae2d76 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -55,7 +55,6 @@ # endif # ifdef CONFIG_POST # define CONFIG_CMD_DIAG -# define CONFIG_POST_ALT_LIST # endif # ifdef CONFIG_RTC_BFIN # define CONFIG_CMD_DATE |