Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-blackfin

Browse Source
This commit is contained in:
Tom Rini
2014-08-12 16:54:55 -04:00
parent a305fb155e d54d7eb965
commit 5b7d0027c2
16 changed files with 380 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/configs/bf506f-ezkit.h
View File

@@ -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

3
include/configs/bf533-stamp.h
View File

@@ -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

3
include/configs/bf538f-ezkit.h
View File

@@ -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

3
include/watchdog.h
View File

@@ -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