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 'next'
[platform/kernel/u-boot.git]
/
include
/
configs
/
bfin_adi_common.h
diff --git
a/include/configs/bfin_adi_common.h
b/include/configs/bfin_adi_common.h
index
d3ae3a7
..
9c537e0
100644
(file)
--- a/
include/configs/bfin_adi_common.h
+++ b/
include/configs/bfin_adi_common.h
@@
-9,7
+9,6
@@
* Command Settings
*/
#ifndef _CONFIG_CMD_DEFAULT_H
* Command Settings
*/
#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
# ifdef ADI_CMDS_NETWORK
# define CONFIG_CMD_DHCP
# define CONFIG_BOOTP_SUBNETMASK
# ifdef ADI_CMDS_NETWORK
# define CONFIG_CMD_DHCP
# define CONFIG_BOOTP_SUBNETMASK
@@
-23,10
+22,6
@@
# ifdef CONFIG_BFIN_MAC
# define CONFIG_CMD_MII
# endif
# ifdef CONFIG_BFIN_MAC
# define CONFIG_CMD_MII
# endif
-# else
-# undef CONFIG_CMD_BOOTD
-# undef CONFIG_CMD_NET
-# undef CONFIG_CMD_NFS
# endif
# ifdef CONFIG_LIBATA
# define CONFIG_CMD_FAT
# endif
# ifdef CONFIG_LIBATA
# define CONFIG_CMD_FAT
@@
-38,6
+33,7
@@
# define CONFIG_CMD_FAT
# define CONFIG_CMD_MMC
# define CONFIG_DOS_PARTITION
# define CONFIG_CMD_FAT
# define CONFIG_CMD_MMC
# define CONFIG_DOS_PARTITION
+# define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
# endif
# ifdef CONFIG_MMC_SPI
# define CONFIG_CMD_MMC_SPI
# endif
# ifdef CONFIG_MMC_SPI
# define CONFIG_CMD_MMC_SPI
@@
-71,14
+67,11
@@
# ifdef CONFIG_SPI_FLASH
# define CONFIG_CMD_SF
# endif
# ifdef CONFIG_SPI_FLASH
# define CONFIG_CMD_SF
# endif
-# if defined(CONFIG_
HARD_I2C) || defined(CONFIG_SOFT_I2C
)
+# if defined(CONFIG_
SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT
)
# define CONFIG_CMD_I2C
# define CONFIG_SOFT_I2C_READ_REPEATED_START
# endif
# define CONFIG_CMD_I2C
# define CONFIG_SOFT_I2C_READ_REPEATED_START
# endif
-# ifdef CONFIG_SYS_NO_FLASH
-# undef CONFIG_CMD_FLASH
-# undef CONFIG_CMD_IMLS
-# else
+# ifndef CONFIG_SYS_NO_FLASH
# define CONFIG_CMD_JFFS2
# endif
# ifdef CONFIG_CMD_JFFS2
# define CONFIG_CMD_JFFS2
# endif
# ifdef CONFIG_CMD_JFFS2
@@
-87,8
+80,6
@@
# define CONFIG_CMD_BOOTLDR
# define CONFIG_CMD_CACHE
# define CONFIG_CMD_CPLBINFO
# define CONFIG_CMD_BOOTLDR
# define CONFIG_CMD_CACHE
# define CONFIG_CMD_CPLBINFO
-# define CONFIG_CMD_ELF
-# define CONFIG_CMD_GPIO
# define CONFIG_CMD_KGDB
# define CONFIG_CMD_LDRINFO
# define CONFIG_CMD_REGINFO
# define CONFIG_CMD_KGDB
# define CONFIG_CMD_LDRINFO
# define CONFIG_CMD_REGINFO
@@
-111,8
+102,8
@@
#ifndef CONFIG_BAUDRATE
# define CONFIG_BAUDRATE 57600
#endif
#ifndef CONFIG_BAUDRATE
# define CONFIG_BAUDRATE 57600
#endif
-#if
ndef CONFIG_DEBUG_EARLY_SERIAL
-# define CONFIG_
SYS_BFIN_UART
+#if
def CONFIG_UART_CONSOLE
+# define CONFIG_
BFIN_SERIAL
#endif
/*
#endif
/*
@@
-287,19
+278,12
@@
* SPI Settings
*/
#ifdef CONFIG_SPI_FLASH_ALL
* SPI Settings
*/
#ifdef CONFIG_SPI_FLASH_ALL
-# define CONFIG_SPI_FLASH_ATMEL
-# define CONFIG_SPI_FLASH_EON
-# define CONFIG_SPI_FLASH_MACRONIX
-# define CONFIG_SPI_FLASH_SPANSION
-# define CONFIG_SPI_FLASH_SST
-# define CONFIG_SPI_FLASH_STMICRO
-# define CONFIG_SPI_FLASH_WINBOND
#endif
/*
* I2C Settings
*/
#endif
/*
* I2C Settings
*/
-#if defined(CONFIG_
HARD_I2C) || defined(CONFIG_SOFT_I2C
)
+#if defined(CONFIG_
SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT
)
# ifndef CONFIG_SYS_I2C_SPEED
# define CONFIG_SYS_I2C_SPEED 50000
# endif
# ifndef CONFIG_SYS_I2C_SPEED
# define CONFIG_SYS_I2C_SPEED 50000
# endif
@@
-317,5
+301,13
@@
#define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */
#define CONFIG_LZMA
#define CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */
#define CONFIG_LZMA
#define CONFIG_MONITOR_IS_IN_RAM
-
+#ifdef CONFIG_HW_WATCHDOG
+# define CONFIG_BFIN_WATCHDOG
+# ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
+# define CONFIG_WATCHDOG_TIMEOUT_MSECS 5000
+# endif
+#endif
+#ifndef CONFIG_ADI_GPIO2
+# define CONFIG_ADI_GPIO1
+#endif
#endif
#endif