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 git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf537-pnav.h
diff --git
a/include/configs/bf537-pnav.h
b/include/configs/bf537-pnav.h
index
da4f2f2
..
bced1df
100644
(file)
--- a/
include/configs/bf537-pnav.h
+++ b/
include/configs/bf537-pnav.h
@@
-1,5
+1,5
@@
/*
/*
- * U-
b
oot - Configuration file for BF537 PNAV board
+ * U-
B
oot - Configuration file for BF537 PNAV board
*/
#ifndef __CONFIG_BF537_PNAV_H__
*/
#ifndef __CONFIG_BF537_PNAV_H__
@@
-7,13
+7,12
@@
#include <asm/config-pre.h>
#include <asm/config-pre.h>
-
/*
* Processor Settings
*/
/*
* Processor Settings
*/
+#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
#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
@@
-37,7
+36,6
@@
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 4
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 4
-
/*
* Memory Settings
*/
/*
* Memory Settings
*/
@@
-54,7
+52,6
@@
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
-
/*
* Network Settings
*/
/*
* Network Settings
*/
@@
-62,12
+59,8
@@
#define ADI_CMDS_NETWORK 1
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
#define ADI_CMDS_NETWORK 1
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
-#define CONFIG_NET_MULTI 1
#endif
#define CONFIG_HOSTNAME bf537-pnav
#endif
#define CONFIG_HOSTNAME bf537-pnav
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR 02:80:ad:24:21:18 */
-
/*
* Flash Settings
/*
* Flash Settings
@@
-78,16
+71,12
@@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 71
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 71
-
/*
* 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
@@
-111,13
+100,12
@@
* it linked after the configuration sector.
*/
# define LDS_BOARD_TEXT \
* it linked after the configuration sector.
*/
# define LDS_BOARD_TEXT \
- arch/blackfin/lib/
libblackf
in.o (.text*); \
- arch/blackfin/cpu/
libblackf
in.o (.text*); \
+ arch/blackfin/lib/
built-
in.o (.text*); \
+ arch/blackfin/cpu/
built-
in.o (.text*); \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
#endif
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
#endif
-
/*
* NAND Settings
*/
/*
* NAND Settings
*/
@@
-138,19
+126,16
@@
#define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd)
#define NAND_PLAT_GPIO_DEV_READY GPIO_PF12
#define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd)
#define NAND_PLAT_GPIO_DEV_READY GPIO_PF12
-
/*
* I2C settings
*/
/*
* I2C settings
*/
-#define CONFIG_BFIN_TWI_I2C 1
-#define CONFIG_HARD_I2C 1
-
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
/*
* Misc Settings
*/
#define CONFIG_BAUDRATE 115200
/*
* Misc Settings
*/
#define CONFIG_BAUDRATE 115200
-#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
@@
-163,7
+148,6
@@
#define CONFIG_BOOTCOMMAND "run nandboot"
#define CONFIG_BOOTARGS_ROOT "/dev/mtdblock1 rw rootfstype=yaffs"
#define CONFIG_BOOTCOMMAND "run nandboot"
#define CONFIG_BOOTARGS_ROOT "/dev/mtdblock1 rw rootfstype=yaffs"
-
/*
* Pull in common ADI header for remaining command/environment setup
*/
/*
* Pull in common ADI header for remaining command/environment setup
*/