X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fcontrolcenterd.h;h=1bb8d93ba0658f716e6fc7ec848dcd5c40ab69b6;hb=89cb2b5f8be4f6d04bd87220aa8f72eb0850edc4;hp=868813f29b1f3e5d96437069dabd16bbdd676dd9;hpb=f763be224fa78893384416734419d8e052c1c5ef;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 868813f..1bb8d93 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) - /* * Memory map * @@ -177,7 +176,6 @@ * Serial Port */ #define CONFIG_CONS_INDEX 2 -#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) @@ -199,9 +197,9 @@ #define CONFIG_SYS_FSL_I2C2_SPEED 400000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100 -/* Probing DP501 I2C-Bridge will hang */ -#define CONFIG_SYS_I2C_NOPROBES { {0, 0x30}, {0, 0x37}, {0, 0x3a}, \ - {0, 0x3b}, {0, 0x50} } + +#ifndef CONFIG_TRAILBLAZER +#endif #define CONFIG_PCA9698 /* NXP PCA9698 */ @@ -214,36 +212,22 @@ * eSPI - Enhanced SPI */ #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO - -#define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 #endif -/* - * TPM - */ -#define CONFIG_TPM_ATMEL_TWI -#define CONFIG_TPM -#define CONFIG_TPM_AUTH_SESSIONS #define CONFIG_SHA1 -#define CONFIG_CMD_TPM /* * MMC */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_CMD_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR - #ifndef CONFIG_TRAILBLAZER /* @@ -335,7 +319,6 @@ * USB */ #define CONFIG_USB_EHCI -#define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #define CONFIG_HAS_FSL_DR_USB @@ -350,7 +333,6 @@ #if defined(CONFIG_TRAILBLAZER) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ -#undef CONFIG_CMD_SAVEENV #elif defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 @@ -375,7 +357,6 @@ * Command line configuration. */ #ifndef CONFIG_TRAILBLAZER -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ @@ -392,19 +373,10 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#include - #ifndef CONFIG_TRAILBLAZER -#define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT #define CONFIG_CMD_IRQ -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO /* @@ -415,23 +387,11 @@ #define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS - -/* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE - #else /* CONFIG_TRAILBLAZER */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -#undef CONFIG_CMD_BOOTM #endif /* CONFIG_TRAILBLAZER */