diff options
| author | Tom Rini <trini@ti.com> | 2014-08-12 16:54:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-12 16:54:55 -0400 |
| commit | 5b7d0027c2463101dabf337a7cccd768fc20b85e (patch) | |
| tree | 2d9d012bc4c7d3532e95ba0ecbdbf683190b9f8b /include | |
| parent | a305fb155ea3d9c3c3859bd04737e3e260344e4c (diff) | |
| parent | d54d7eb965e96fc451beaac58cd79efdcf848fd9 (diff) | |
| download | u-boot-imx-5b7d0027c2463101dabf337a7cccd768fc20b85e.zip u-boot-imx-5b7d0027c2463101dabf337a7cccd768fc20b85e.tar.gz u-boot-imx-5b7d0027c2463101dabf337a7cccd768fc20b85e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/bf506f-ezkit.h | 5 | ||||
| -rw-r--r-- | include/configs/bf533-stamp.h | 3 | ||||
| -rw-r--r-- | include/configs/bf538f-ezkit.h | 3 | ||||
| -rw-r--r-- | include/watchdog.h | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index eed2d5b..5db1819 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -56,7 +56,7 @@ /* * Flash Settings */ - +/* #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_BASE 0x20000000 #define CONFIG_SYS_FLASH_CFI @@ -64,9 +64,8 @@ #define CONFIG_SYS_MAX_FLASH_SECT 71 #define CONFIG_CMD_FLASH #define CONFIG_MONITOR_IS_IN_RAM -/* -#define CONFIG_SYS_NO_FLASH */ +#define CONFIG_SYS_NO_FLASH /* * SPI Settings diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index d82c5b2..3d36d84 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -98,10 +98,11 @@ */ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 +/* #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL - +*/ /* * Env Storage Settings diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 742c299..32df5ec 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -83,10 +83,11 @@ */ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 +/* #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL - +*/ /* * Env Storage Settings diff --git a/include/watchdog.h b/include/watchdog.h index bd0a8d6..9273fa1 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -21,7 +21,8 @@ int init_func_watchdog_reset(void); #endif -#ifdef CONFIG_WATCHDOG +#if defined(CONFIG_SYS_GENERIC_BOARD) && \ + (defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)) #define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init, #define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset, #else |