diff options
author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:13:07 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:13:07 +0200 |
commit | 1730edf76c54381475e2da11f75b1ce563c4e62c (patch) | |
tree | 1f2a9fb7a7cd9b547374d9cc3715a7f18001e1ee /include/configs/CPCI4052.h | |
parent | 5ea67393b8b554b8165c38912d753a8df043020d (diff) | |
parent | b2815f79288d4da7a3ba18bdbd05120ce09d5622 (diff) | |
download | u-boot-imx-1730edf76c54381475e2da11f75b1ce563c4e62c.zip u-boot-imx-1730edf76c54381475e2da11f75b1ce563c4e62c.tar.gz u-boot-imx-1730edf76c54381475e2da11f75b1ce563c4e62c.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'include/configs/CPCI4052.h')
-rw-r--r-- | include/configs/CPCI4052.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index b248639..fd49f56 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -88,32 +88,17 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_ELF #define CONFIG_CMD_DATE -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM - -#if 0 /* test-only */ -#define CONFIG_NETCONSOLE -#define CONFIG_NET_MULTI - -#ifdef CONFIG_NET_MULTI -#define CONFIG_PHY1_ADDR 1 /* PHY address: for NetConsole */ -#endif -#endif - #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT -#if 0 /* test-only */ -#define CONFIG_AUTO_UPDATE 1 /* autoupdate via compactflash */ -#endif - #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_SDRAM_BANK0 1 /* init onboard SDRAM bank 0 */ @@ -256,29 +241,6 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ - -/* - * JFFS2 partitions - */ - -/* No command line, one static partition, use whole device */ -#undef CONFIG_JFFS2_CMDLINE -#define CONFIG_JFFS2_DEV "nor0" -#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF -#define CONFIG_JFFS2_PART_OFFSET 0x00000000 - -/* mtdparts command line support */ - -/* Use first bank for JFFS2, second bank contains U-Boot. - * - * Note: fake mtd_id's used, no linux mtd map file. - */ -/* -#define CONFIG_JFFS2_CMDLINE -#define MTDIDS_DEFAULT "nor0=cpci4052-0" -#define MTDPARTS_DEFAULT "mtdparts=cpci4052-0:-(jffs2)" -*/ - #if 0 /* Use NVRAM for environment variables */ /*----------------------------------------------------------------------- * NVRAM organization |