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
disk: convert CONFIG_DOS_PARTITION to 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
57d9b97
..
72099bf
100644
(file)
--- a/
include/configs/bfin_adi_common.h
+++ b/
include/configs/bfin_adi_common.h
@@
-9,45
+9,27
@@
* Command Settings
*/
#ifndef _CONFIG_CMD_DEFAULT_H
* Command Settings
*/
#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
-# if ADI_CMDS_NETWORK
-# define CONFIG_CMD_DHCP
+# ifdef ADI_CMDS_NETWORK
# define CONFIG_BOOTP_SUBNETMASK
# define CONFIG_BOOTP_GATEWAY
# define CONFIG_BOOTP_DNS
# define CONFIG_BOOTP_NTPSERVER
# define CONFIG_BOOTP_RANDOM_DELAY
# define CONFIG_KEEP_SERVERADDR
# define CONFIG_BOOTP_SUBNETMASK
# define CONFIG_BOOTP_GATEWAY
# define CONFIG_BOOTP_DNS
# define CONFIG_BOOTP_NTPSERVER
# define CONFIG_BOOTP_RANDOM_DELAY
# define CONFIG_KEEP_SERVERADDR
-# define CONFIG_CMD_DNS
-# define CONFIG_CMD_PING
# ifdef CONFIG_BFIN_MAC
# ifdef CONFIG_BFIN_MAC
-# define CONFIG_CMD_MII
# endif
# endif
-# else
-# undef CONFIG_CMD_BOOTD
-# undef CONFIG_CMD_NET
-# undef CONFIG_CMD_NFS
# endif
# ifdef CONFIG_LIBATA
# endif
# ifdef CONFIG_LIBATA
-# define CONFIG_CMD_FAT
# define CONFIG_CMD_SATA
# define CONFIG_CMD_SATA
-# define CONFIG_DOS_PARTITION
# endif
# ifdef CONFIG_MMC
# endif
# ifdef CONFIG_MMC
-# define CONFIG_CMD_EXT2
-# 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_USB
# endif
# ifdef CONFIG_MMC_SPI
# define CONFIG_CMD_MMC_SPI
# endif
# ifdef CONFIG_USB
-# define CONFIG_CMD_EXT2
-# define CONFIG_CMD_FAT
-# define CONFIG_CMD_USB
# define CONFIG_CMD_USB_STORAGE
# define CONFIG_CMD_USB_STORAGE
-# define CONFIG_DOS_PARTITION
# endif
# if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN)
# define CONFIG_CMD_NAND
# endif
# if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN)
# define CONFIG_CMD_NAND
@@
-55,41
+37,26
@@
# endif
# ifdef CONFIG_POST
# define CONFIG_CMD_DIAG
# endif
# ifdef CONFIG_POST
# define CONFIG_CMD_DIAG
-# define CONFIG_POST_ALT_LIST
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE
-# if ADI_CMDS_NETWORK
-# define CONFIG_CMD_SNTP
+# ifdef ADI_CMDS_NETWORK
# endif
# endif
# ifdef CONFIG_SPI
# define CONFIG_CMD_EEPROM
# endif
# endif
# endif
# ifdef CONFIG_SPI
# define CONFIG_CMD_EEPROM
# endif
-# if defined(CONFIG_BFIN_SPI) || defined(CONFIG_SOFT_SPI)
-# define CONFIG_CMD_SPI
-# endif
-# ifdef CONFIG_SPI_FLASH
-# define CONFIG_CMD_SF
-# endif
-# if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
-# define CONFIG_CMD_I2C
+# if defined(CONFIG_SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT)
# define CONFIG_SOFT_I2C_READ_REPEATED_START
# endif
# 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_JFFS2_SUMMARY
# endif
# define CONFIG_CMD_BOOTLDR
# define CONFIG_CMD_JFFS2
# endif
# ifdef CONFIG_CMD_JFFS2
# define CONFIG_JFFS2_SUMMARY
# endif
# define CONFIG_CMD_BOOTLDR
-# define CONFIG_CMD_CACHE
# define CONFIG_CMD_CPLBINFO
# 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
@@
-108,13
+75,11
@@
#define CONFIG_AUTO_COMPLETE 1
#define CONFIG_LOADS_ECHO 1
#define CONFIG_JTAG_CONSOLE
#define CONFIG_AUTO_COMPLETE 1
#define CONFIG_LOADS_ECHO 1
#define CONFIG_JTAG_CONSOLE
-#define CONFIG_SILENT_CONSOLE
#ifndef CONFIG_BAUDRATE
# define CONFIG_BAUDRATE 57600
#endif
#ifndef CONFIG_BAUDRATE
# define CONFIG_BAUDRATE 57600
#endif
-#ifndef CONFIG_DEBUG_EARLY_SERIAL
-# define CONFIG_SERIAL_MULTI
-# define CONFIG_SYS_BFIN_UART
+#ifdef CONFIG_UART_CONSOLE
+# define CONFIG_BFIN_SERIAL
#endif
/*
#endif
/*
@@
-128,13
+93,6
@@
/*
* Env Settings
*/
/*
* Env Settings
*/
-#ifndef CONFIG_BOOTDELAY
-# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
-# define CONFIG_BOOTDELAY -1
-# else
-# define CONFIG_BOOTDELAY 5
-# endif
-#endif
#ifndef CONFIG_BOOTCOMMAND
# define CONFIG_BOOTCOMMAND "run ramboot"
#endif
#ifndef CONFIG_BOOTCOMMAND
# define CONFIG_BOOTCOMMAND "run ramboot"
#endif
@@
-151,13
+109,14
@@
#endif
#define CONFIG_BOOTARGS \
"root=" CONFIG_BOOTARGS_ROOT " " \
#endif
#define CONFIG_BOOTARGS \
"root=" CONFIG_BOOTARGS_ROOT " " \
- "clkin_hz="
MK_STR
(CONFIG_CLKIN_HZ) " " \
+ "clkin_hz="
__stringify
(CONFIG_CLKIN_HZ) " " \
"earlyprintk=" \
"serial," \
"earlyprintk=" \
"serial," \
- "uart"
MK_STR
(CONFIG_UART_CONSOLE) "," \
-
MK_STR
(CONFIG_BAUDRATE) " " \
+ "uart"
__stringify
(CONFIG_UART_CONSOLE) "," \
+
__stringify
(CONFIG_BAUDRATE) " " \
CONFIG_BOOTARGS_VIDEO \
CONFIG_BOOTARGS_VIDEO \
- "console=ttyBF" MK_STR(CONFIG_UART_CONSOLE) "," MK_STR(CONFIG_BAUDRATE)
+ "console=ttyBF" __stringify(CONFIG_UART_CONSOLE) "," \
+ __stringify(CONFIG_BAUDRATE)
#if defined(CONFIG_CMD_NAND)
# define NAND_ENV_SETTINGS \
"nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
#if defined(CONFIG_CMD_NAND)
# define NAND_ENV_SETTINGS \
"nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
@@
-184,8
+143,8
@@
# define CONFIG_BFIN_SPI_IMG_SIZE 0x40000
# endif
# define UBOOT_ENV_UPDATE \
# define CONFIG_BFIN_SPI_IMG_SIZE 0x40000
# endif
# define UBOOT_ENV_UPDATE \
- "sf probe "
MK_STR
(BFIN_BOOT_SPI_SSEL) ";" \
- "sf erase 0 "
MK_STR
(CONFIG_BFIN_SPI_IMG_SIZE) ";" \
+ "sf probe "
__stringify
(BFIN_BOOT_SPI_SSEL) ";" \
+ "sf erase 0 "
__stringify
(CONFIG_BFIN_SPI_IMG_SIZE) ";" \
"sf write $(loadaddr) 0 $(filesize)"
# endif
# elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
"sf write $(loadaddr) 0 $(filesize)"
# endif
# elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
@@
-194,10
+153,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 \
@@
-266,7
+227,7
@@
# define CONFIG_SERVERIP 192.168.0.2
# endif
# ifndef CONFIG_ROOTPATH
# define CONFIG_SERVERIP 192.168.0.2
# endif
# ifndef CONFIG_ROOTPATH
-# define CONFIG_ROOTPATH
/romfs
+# define CONFIG_ROOTPATH
"/romfs"
# endif
# ifdef CONFIG_CMD_DHCP
# ifndef CONFIG_SYS_AUTOLOAD
# endif
# ifdef CONFIG_CMD_DHCP
# ifndef CONFIG_SYS_AUTOLOAD
@@
-286,19
+247,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
@@
-316,5
+270,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