projects
/
platform
/
kernel
/
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 git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf537-minotaur.h
diff --git
a/include/configs/bf537-minotaur.h
b/include/configs/bf537-minotaur.h
index
11929c7
..
43a9032
100644
(file)
--- a/
include/configs/bf537-minotaur.h
+++ b/
include/configs/bf537-minotaur.h
@@
-1,5
+1,5
@@
/*
/*
- * U-
b
oot - Configuration file for CSP Minotaur board
+ * U-
B
oot - Configuration file for CSP Minotaur board
*
* Thu Oct 25 15:30:44 CEST 2007 <hackfin@section5.ch>
* Minotaur config, brushed up for official uClinux dist.
*
* Thu Oct 25 15:30:44 CEST 2007 <hackfin@section5.ch>
* Minotaur config, brushed up for official uClinux dist.
@@
-20,14
+20,12
@@
#include <asm/config-pre.h>
#include <asm/config-pre.h>
-
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
-
/*
* Clock Settings
* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
/*
* Clock Settings
* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@
-51,7
+49,6
@@
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 5
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 5
-
/*
* Memory Settings
*/
/*
* Memory Settings
*/
@@
-68,14
+65,12
@@
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
#define CONFIG_SYS_MALLOC_LEN (128 << 10)
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
#define CONFIG_SYS_MALLOC_LEN (128 << 10)
-
/*
* Network Settings
*/
#ifndef __ADSPBF534__
#define CONFIG_BFIN_MAC
#define CONFIG_NETCONSOLE 1
/*
* Network Settings
*/
#ifndef __ADSPBF534__
#define CONFIG_BFIN_MAC
#define CONFIG_NETCONSOLE 1
-#define CONFIG_NET_MULTI 1
#endif
#ifdef CONFIG_BFIN_MAC
#define CONFIG_IPADDR 192.168.0.15
#endif
#ifdef CONFIG_BFIN_MAC
#define CONFIG_IPADDR 192.168.0.15
@@
-86,10
+81,7
@@
#endif
#define CONFIG_SYS_AUTOLOAD "no"
#endif
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_ROOTPATH /romfs
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
-
+#define CONFIG_ROOTPATH "/romfs"
/*
* Flash Settings
/*
* Flash Settings
@@
-97,16
+89,12
@@
/* We don't have a parallel flash chip there */
#define CONFIG_SYS_NO_FLASH
/* We don't have a parallel flash chip there */
#define CONFIG_SYS_NO_FLASH
-
/*
* SPI Settings
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
#define CONFIG_SF_DEFAULT_SPEED 30000000
/*
* SPI Settings
*/
#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_STMICRO
-
/*
* Env Storage Settings
/*
* Env Storage Settings
@@
-117,26
+105,24
@@
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
-
/*
* I2C settings
*/
/*
* I2C settings
*/
-#define CONFIG_
BFIN_TWI_I2C 1
-#define CONFIG_
HARD_I2C 1
+#define CONFIG_
SYS_I2C
+#define CONFIG_
SYS_I2C_ADI
#define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0
#define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0
-
/*
* Misc Settings
*/
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_ENV_OVERWRITE 1
/*
* Misc Settings
*/
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_ENV_OVERWRITE 1
-#define CONFIG_MISC_INIT_R
#define CONFIG_BAUDRATE 57600
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BAUDRATE 57600
#define CONFIG_UART_CONSOLE 0
+#define CONFIG_BFIN_SERIAL
#define CONFIG_PANIC_HANG 1
#define CONFIG_RTC_BFIN 1
#define CONFIG_PANIC_HANG 1
#define CONFIG_RTC_BFIN 1
@@
-149,32
+135,15
@@
# define CONFIG_BOOTDELAY 5
#endif
# define CONFIG_BOOTDELAY 5
#endif
-#include <config_cmd_default.h>
-
-#ifdef CONFIG_BFIN_MAC
-# define CONFIG_CMD_DHCP
-# define CONFIG_CMD_PING
-#else
-# undef CONFIG_CMD_NET
-# undef CONFIG_CMD_NFS
-#endif
-
#define CONFIG_CMD_BOOTLDR
#define CONFIG_CMD_BOOTLDR
-#define CONFIG_CMD_CACHE
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
-#define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IMLS
-#define CONFIG_CMD_SF
#define CONFIG_BOOTCOMMAND "run ramboot"
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"
#define CONFIG_BOOTCOMMAND "run ramboot"
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"
-#define CONFIG_SYS_PROMPT "minotaur> "
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
- "sf probe "
MK_STR
(BFIN_BOOT_SPI_SSEL) ";" \
+ "sf probe "
__stringify
(BFIN_BOOT_SPI_SSEL) ";" \
"sf erase 0 0x30000;" \
"sf write $(loadaddr) 0 $(filesize)" \
"flashboot=sf read 0x1000000 0x30000 0x320000;" \
"sf erase 0 0x30000;" \
"sf write $(loadaddr) 0 $(filesize)" \
"flashboot=sf read 0x1000000 0x30000 0x320000;" \