X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fcontrolcenterd.h;h=6641408fcbb182d91dccd02e1cc071514b758975;hb=5b8e76c35ec312a3f73126bd1a2d2c0965b98a9f;hp=7347b68eb4ce798a325f9d7d582518419919b015;hpb=d26e34c4c4b6473fdbd412a3b2dc33a94b08e8ff;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 7347b68..6641408 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -38,7 +38,6 @@ #define CONFIG_CONTROLCENTERD #define CONFIG_MP /* support multiple processors */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENABLE_36BIT_PHYS #ifdef CONFIG_PHYS_64BIT @@ -122,7 +121,6 @@ #define CONFIG_SYS_SDRAM_SIZE 1024 #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) @@ -138,7 +136,6 @@ /* * Local Bus Definitions */ -#define CONFIG_FSL_ELBC /* Has Enhanced localbus controller */ #define CONFIG_SYS_ELBC_BASE 0xe0000000 #ifdef CONFIG_PHYS_64BIT @@ -188,7 +185,6 @@ #define CONFIG_PCA9698 /* NXP PCA9698 */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 @@ -202,13 +198,9 @@ #define CONFIG_SF_DEFAULT_MODE 0 #endif -#define CONFIG_SHA1 - /* * MMC */ -#define CONFIG_GENERIC_MMC - #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR @@ -219,7 +211,6 @@ */ #define CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) -#define CONFIG_CMD_BMP /* * General PCI @@ -297,7 +288,6 @@ /* * USB */ -#define CONFIG_USB_EHCI #define CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI_FSL @@ -351,21 +341,17 @@ #ifndef CONFIG_TRAILBLAZER -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO /* * Board initialisation callbacks */ -#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT #else /* CONFIG_TRAILBLAZER */ -#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT @@ -377,7 +363,6 @@ #define CONFIG_HW_WATCHDOG #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -#define CONFIG_DOS_PARTITION /* * For booting Linux, the board info and command line data @@ -392,9 +377,6 @@ */ #ifdef CONFIG_TRAILBLAZER - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "mp_holdoff=1\0" @@ -407,9 +389,6 @@ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \