diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-20 22:55:29 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-20 22:55:29 +0200 |
| commit | 725e53a70dfc8e96965715c1f61ae002061dac6b (patch) | |
| tree | 10d026062a6e09f3c98fd421d9258a0c2db1ed5f /include | |
| parent | 23b5b1d3e1e33e9650cc7a4e09901272a3811c64 (diff) | |
| parent | 8d1fea2c4041e665c96944e3f6fcffbde55db34b (diff) | |
| download | u-boot-imx-725e53a70dfc8e96965715c1f61ae002061dac6b.zip u-boot-imx-725e53a70dfc8e96965715c1f61ae002061dac6b.tar.gz u-boot-imx-725e53a70dfc8e96965715c1f61ae002061dac6b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-blackfin/blackfin_local.h | 3 | ||||
| -rw-r--r-- | include/configs/bf533-stamp.h | 2 | ||||
| -rw-r--r-- | include/configs/bf537-minotaur.h | 5 | ||||
| -rw-r--r-- | include/configs/bf537-srv1.h | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/include/asm-blackfin/blackfin_local.h b/include/asm-blackfin/blackfin_local.h index e17d8a2..8ec7928 100644 --- a/include/asm-blackfin/blackfin_local.h +++ b/include/asm-blackfin/blackfin_local.h @@ -61,6 +61,9 @@ extern u_long get_sclk(void); # define bfin_revid() (*pCHIPID >> 28) +extern bool bfin_os_log_check(void); +extern void bfin_os_log_dump(void); + extern void blackfin_icache_flush_range(const void *, const void *); extern void blackfin_dcache_flush_range(const void *, const void *); extern void blackfin_icache_dcache_flush_range(const void *, const void *); diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index c03561c..4be2a5c 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -36,7 +36,7 @@ #define CONFIG_CCLK_DIV 1 /* SCLK_DIV controls the system clock divider */ /* Values can range from 1-15 */ -#define CONFIG_SCLK_DIV 5 +#define CONFIG_SCLK_DIV 6 /* note: 1.2 boards can go faster */ /* diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 23c2d33..463b7d0 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -87,9 +87,8 @@ #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH /romfs -/* Use a fixed MAC address for booting up. Firstboot linux - * must fetch a valid MAC from the production server. */ -#define CONFIG_ETHADDR 02:80:ad:20:31:42 +/* Uncomment next line to use fixed MAC address */ +/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */ /* diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 727b7e7..7368629 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -87,9 +87,8 @@ #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH /romfs -/* Use a fixed MAC address for booting up. Firstboot linux - * must fetch a valid MAC from the production server. */ -#define CONFIG_ETHADDR 02:80:ad:20:31:42 +/* Uncomment next line to use fixed MAC address */ +/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */ /* |