X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2FMPC8560ADS.h;h=218d77d1bd8e7e0fec1637d7f71f9802c1ee3c91;hb=d26e34c4c4b6473fdbd412a3b2dc33a94b08e8ff;hp=e1bc8ccd3253e65ae8671d73a4cccb5e5655f947;hpb=a69fdc7787bfa2f27eed74c2ee58c28ce932d502;p=u-boot diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index e1bc8ccd32..218d77d1bd 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -18,15 +18,8 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_DISPLAY_BOARDINFO - /* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_CPM2 1 /* has CPM2 */ -#define CONFIG_MPC8560ADS 1 /* MPC8560ADS board specific */ -#define CONFIG_MPC8560 1 /* * default CCARBAR is at 0xff700000 @@ -34,13 +27,11 @@ */ #define CONFIG_SYS_TEXT_BASE 0xfff80000 -#define CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ #undef CONFIG_ETHER_ON_FCC /* cpm FCC ethernet support */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ #define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */ /* @@ -61,7 +52,6 @@ #define CONFIG_SYS_CLK_FREQ 33000000 #endif - /* * These can be toggled for performance analysis, otherwise use default. */ @@ -77,7 +67,6 @@ #define CONFIG_SYS_CCSRBAR_PHYS_LOW CONFIG_SYS_CCSRBAR /* DDR Setup */ -#define CONFIG_SYS_FSL_DDR1 #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/ #define CONFIG_DDR_SPD #undef CONFIG_FSL_DDR_INTERACTIVE @@ -134,7 +123,6 @@ #undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ @@ -199,7 +187,6 @@ #define CONFIG_SYS_LBC_LSDMR_4 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW) #define CONFIG_SYS_LBC_LSDMR_5 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_NORMAL) - /* * 32KB, 8-bit wide for ADS config reg */ @@ -227,16 +214,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ @@ -267,9 +244,6 @@ #define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */ #if defined(CONFIG_PCI) - -#define CONFIG_PCI_PNP /* do pci plug-and-play */ - #undef CONFIG_EEPRO100 #undef CONFIG_TULIP @@ -284,7 +258,6 @@ #endif /* CONFIG_PCI */ - #ifdef CONFIG_TSEC_ENET #ifndef CONFIG_MII @@ -356,7 +329,6 @@ #endif - /* * Environment */ @@ -383,12 +355,9 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME - /* * Command line configuration. */ -#define CONFIG_CMD_PING -#define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO @@ -397,7 +366,6 @@ #endif #if defined(CONFIG_ETHER_ON_FCC) - #define CONFIG_CMD_MII #endif #undef CONFIG_WATCHDOG /* watchdog disabled */ @@ -432,7 +400,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif - /* * Environment Configuration */ @@ -455,7 +422,6 @@ #define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ -#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ #define CONFIG_BAUDRATE 115200