X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fbfin_adi_common.h;h=72099bff9729a9d94a3ab0d4f35f3de29bbab6fd;hb=b0cf733933c3bc1b4ab353e16affabc60f863db5;hp=143d3ddd2d8e699af12dc585ce606fecae20e5ee;hpb=bd5053ffa5b8162257537bdb79ba829372423096;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 143d3dd..72099bf 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -9,47 +9,27 @@ * Command Settings */ #ifndef _CONFIG_CMD_DEFAULT_H -# include # ifdef ADI_CMDS_NETWORK -# define CONFIG_CMD_DHCP # define CONFIG_BOOTP_SUBNETMASK # define CONFIG_BOOTP_GATEWAY # define CONFIG_BOOTP_DNS # define CONFIG_BOOTP_NTPSERVER # define CONFIG_BOOTP_RANDOM_DELAY -# define CONFIG_LIB_RAND # define CONFIG_KEEP_SERVERADDR -# define CONFIG_CMD_DNS -# define CONFIG_CMD_PING # 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 # define CONFIG_CMD_SATA -# define CONFIG_DOS_PARTITION # 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 -# define CONFIG_CMD_EXT2 -# define CONFIG_CMD_FAT -# define CONFIG_CMD_USB # define CONFIG_CMD_USB_STORAGE -# define CONFIG_DOS_PARTITION # endif # if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN) # define CONFIG_CMD_NAND @@ -61,36 +41,22 @@ # ifdef CONFIG_RTC_BFIN # define CONFIG_CMD_DATE # ifdef ADI_CMDS_NETWORK -# define CONFIG_CMD_SNTP # 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_SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT) -# 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_JFFS2_SUMMARY # endif # 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 @@ -109,7 +75,6 @@ #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 @@ -128,13 +93,6 @@ /* * 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 @@ -289,13 +247,6 @@ * 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 /*