projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ../work into next
[oweals/u-boot.git]
/
include
/
configs
/
bf537-srv1.h
diff --git
a/include/configs/bf537-srv1.h
b/include/configs/bf537-srv1.h
index 1d0b694459fb1d144dcd6013fa4ae08831a9e921..7368629981d037132bdcb5dc9e29ee75e72dbcec 100644
(file)
--- a/
include/configs/bf537-srv1.h
+++ b/
include/configs/bf537-srv1.h
@@
-18,7
+18,7
@@
#ifndef __CONFIG_BF537_SRV1_H__
#define __CONFIG_BF537_SRV1_H__
#ifndef __CONFIG_BF537_SRV1_H__
#define __CONFIG_BF537_SRV1_H__
-#include <asm/
blackfin-
config-pre.h>
+#include <asm/config-pre.h>
/*
/*
@@
-87,9
+87,8
@@
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_ROOTPATH /romfs
#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 */
/*
/*
@@
-104,7
+103,7
@@
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
-#define CONFIG_SF_DEFAULT_
HZ
30000000
+#define CONFIG_SF_DEFAULT_
SPEED
30000000
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_STMICRO
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_STMICRO
@@
-198,7
+197,4
@@
"ramargs=setenv bootargs " CONFIG_BOOTARGS "\0" \
BOOT_ENV_SETTINGS
"ramargs=setenv bootargs " CONFIG_BOOTARGS "\0" \
BOOT_ENV_SETTINGS
-
-#include <asm/blackfin-config-post.h>
-
#endif
#endif