X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fstrider.h;h=14b03c813b6423982251121cf64e58e0547aa0e8;hb=4bafceff0e9e5a36908031e41c69a6b37e82da58;hp=36561e0346e83985bc022fcffa8f9d5163fa9a89;hpb=bb597c0eeb7ee2f6e983577d993c76a30dd3c2b4;p=people%2Fms%2Fu-boot.git diff --git a/include/configs/strider.h b/include/configs/strider.h index 36561e0346..14b03c813b 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -18,35 +18,14 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_STRIDER 1 /* STRIDER board specific */ -#define CONFIG_SYS_TEXT_BASE 0xFE000000 - -#ifdef CONFIG_STRIDER_CPU_DP -#define CONFIG_IDENT_STRING " strider cpu dp 0.01" -#elif defined(CONFIG_STRIDER_CPU) -#define CONFIG_IDENT_STRING " strider cpu 0.01" -#elif defined(CONFIG_STRIDER_CON_DP) -#define CONFIG_IDENT_STRING " strider con dp 0.01" -#else -#define CONFIG_IDENT_STRING " strider con 0.01" -#endif - -#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_SYS_FSL_ERRATUM_ESDHC111 - -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_ALT_MEMTEST -#define CONFIG_CMD_FPGAD -#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ @@ -320,8 +299,6 @@ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000 #define CONFIG_PCA953X /* NXP PCA9554 */ -#define CONFIG_CMD_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x24, 16}, {0x25, 16}, {0x26, 16}, \ {0x3c, 8}, {0x3d, 8}, {0x3e, 8} } @@ -518,12 +495,9 @@ void fpga_control_clear(unsigned int bus, int pin); /* enable PCIE clock */ #define CONFIG_SYS_SCCR_PCIEXP1CM 1 -#define CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCIE -#define CONFIG_PCI_PNP /* do pci plug-and-play */ - #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */ #define CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES 1 @@ -551,7 +525,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment */ #if 1 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ @@ -559,7 +532,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #else -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #endif @@ -569,27 +541,15 @@ void fpga_control_clear(unsigned int bus, int pin); /* * Command line configuration. */ -#define CONFIG_CMD_PCI - -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ -#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET - -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* @@ -655,8 +615,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_HAS_ETH0 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */