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
Move default y configs out of arch/board Kconfig
[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
ccdec0d
..
1c9d584
100644
(file)
--- a/
include/configs/bfin_adi_common.h
+++ b/
include/configs/bfin_adi_common.h
@@
-10,7
+10,7
@@
*/
#ifndef _CONFIG_CMD_DEFAULT_H
# include <config_cmd_default.h>
*/
#ifndef _CONFIG_CMD_DEFAULT_H
# include <config_cmd_default.h>
-# if ADI_CMDS_NETWORK
+# if
def
ADI_CMDS_NETWORK
# define CONFIG_CMD_DHCP
# define CONFIG_BOOTP_SUBNETMASK
# define CONFIG_BOOTP_GATEWAY
# define CONFIG_CMD_DHCP
# define CONFIG_BOOTP_SUBNETMASK
# define CONFIG_BOOTP_GATEWAY
@@
-25,7
+25,6
@@
# endif
# else
# undef CONFIG_CMD_BOOTD
# endif
# else
# undef CONFIG_CMD_BOOTD
-# undef CONFIG_CMD_NET
# undef CONFIG_CMD_NFS
# endif
# ifdef CONFIG_LIBATA
# undef CONFIG_CMD_NFS
# endif
# ifdef CONFIG_LIBATA
@@
-38,6
+37,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
@@
-58,7
+58,7
@@
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE
-# if ADI_CMDS_NETWORK
+# if
def
ADI_CMDS_NETWORK
# define CONFIG_CMD_SNTP
# endif
# endif
# define CONFIG_CMD_SNTP
# endif
# endif
@@
-71,7
+71,7
@@
# 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
@@
-111,8
+111,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
/*
@@
-193,10
+193,12
@@
"nand erase 0 0x40000;" \
"nand write $(loadaddr) 0 0x40000"
# else
"nand erase 0 0x40000;" \
"nand write $(loadaddr) 0 0x40000"
# else
-# define UBOOT_ENV_UPDATE \
+# ifndef UBOOT_ENV_UPDATE
+# define UBOOT_ENV_UPDATE \
"protect off 0x20000000 +$(filesize);" \
"erase 0x20000000 +$(filesize);" \
"cp.b $(loadaddr) 0x20000000 $(filesize)"
"protect off 0x20000000 +$(filesize);" \
"erase 0x20000000 +$(filesize);" \
"cp.b $(loadaddr) 0x20000000 $(filesize)"
+# endif
# endif
# ifdef CONFIG_NETCONSOLE
# define NETCONSOLE_ENV \
# endif
# ifdef CONFIG_NETCONSOLE
# define NETCONSOLE_ENV \
@@
-297,7
+299,7
@@
/*
* I2C Settings
*/
/*
* 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
@@
-315,5
+317,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