diff options
Diffstat (limited to 'include/configs')
51 files changed, 0 insertions, 471 deletions
diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h index df20965640..f53ce57cdd 100644 --- a/include/configs/ADS860.h +++ b/include/configs/ADS860.h @@ -26,11 +26,7 @@ #define CONFIG_BAUDRATE 38400 /* Console baudrate */ -#if 0 -#define CFG_8XX_FACT 1526 /* 32.768 kHz crystal on XTAL/EXTAL */ -#else #define CFG_8XX_FACT 12 /* 4 MHz oscillator on EXTCLK */ -#endif #define CFG_PLPRCR (((CFG_8XX_FACT-1) << PLPRCR_MF_SHIFT) | \ PLPRCR_SPLSS | PLPRCR_TEXPS | PLPRCR_TMIST) diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 7ec4599ebb..b6c5cbee0c 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -315,29 +315,6 @@ * PCI stuff *----------------------------------------------------------------------- */ -#if 0 /* No PCI on CATcenter */ -#define PCI_HOST_ADAPTER 0 /* configure as pci adapter */ -#define PCI_HOST_FORCE 1 /* configure as pci host */ -#define PCI_HOST_AUTO 2 /* detected via arbiter enable */ - -#define CONFIG_PCI /* include pci support */ -#define CONFIG_PCI_HOST PCI_HOST_FORCE /* select pci host function */ -#undef CONFIG_PCI_PNP /* do pci plug-and-play */ - /* resource configuration */ - -#define CONFIG_PCI_SCAN_SHOW /* print pci devices @ startup */ - -#define CFG_PCI_SUBSYS_VENDORID 0x1014 /* PCI Vendor ID: IBM */ -#define CFG_PCI_SUBSYS_DEVICEID 0x0000 /* PCI Device ID: --- */ -#define CFG_PCI_CLASSCODE 0x0b20 /* PCI Class Code: Processor/PPC*/ - -#define CFG_PCI_PTM1LA 0x00000000 /* point to sdram */ -#define CFG_PCI_PTM1MS 0xfc000001 /* 64MB, enable hard-wired to 1 */ -#define CFG_PCI_PTM1PCI 0x00000000 /* Host: use this pci address */ -#define CFG_PCI_PTM2LA 0xffc00000 /* point to flash */ -#define CFG_PCI_PTM2MS 0xffc00001 /* 4MB, enable */ -#define CFG_PCI_PTM2PCI 0x04000000 /* Host: use this pci address */ -#endif /* No PCI */ /*----------------------------------------------------------------------- * Start addresses for the final memory configuration diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index bc23fc0278..933fd5939b 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -562,13 +562,6 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */ -#if 0 -#define CFG_ENV_IS_IN_FLASH 0 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ -/* #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */ -#endif #define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ #define CFG_EEPROM_PAGE_WRITE_BITS 5 diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index 63d7a92404..020de59adc 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -209,7 +209,6 @@ /*----------------------------------------------------------------------- * Definitions for initial stack pointer and data area (in OnChipMem ) */ -#if 1 /* On Chip Memory location */ #define CFG_TEMP_STACK_OCM 1 #define CFG_OCM_DATA_ADDR 0xF0000000 @@ -220,15 +219,6 @@ #define CFG_GBL_DATA_SIZE 256 /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -#else -#define CFG_OCM_DATA_ADDR 0xF0000000 -#define CFG_OCM_DATA_SIZE 0x1000 -#define CFG_INIT_RAM_ADDR CFG_OCM_DATA_ADDR /* inside of On Chip SRAM */ -#define CFG_INIT_RAM_END CFG_OCM_DATA_SIZE /* End of On Chip SRAM */ -#define CFG_GBL_DATA_SIZE 64 /* size in bytes reserved for initial data */ -#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) -#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -#endif /*----------------------------------------------------------------------- * Definitions for Serial Presence Detect EEPROM address diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index bd7aff12cc..f67dd24806 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -160,11 +160,7 @@ if we use PCI it has its own MAC addr */ #define MV_ETH_DEVS 2 /* #undef CONFIG_ETHER_PORT_MII */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 3 /* autoboot after 5 seconds */ -#endif #define CONFIG_ZERO_BOOTDELAY_CHECK diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 4b72e9b9e4..1c5da54754 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -98,11 +98,7 @@ #define MV_ETH_DEVS 3 /* #undef CONFIG_ETHER_PORT_MII */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 3 /* autoboot after 5 seconds */ -#endif #define CONFIG_ZERO_BOOTDELAY_CHECK diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index 0dd21bc618..b6d6905887 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -40,11 +40,7 @@ #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 19200 -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_BOOTCOMMAND "bootm 40020000" /* autoboot command */ #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index 423d74ea07..8aa6f9a3e4 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -40,11 +40,7 @@ #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_BOOTCOMMAND "bootm 40040000" /* autoboot command */ #define CONFIG_BOARD_TYPES 1 /* support board types */ diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index 7cce876924..1510d67e5f 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -157,9 +157,6 @@ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if 0 -#define CFG_HUSH_PARSER 1 /* use "hush" command parser */ -#endif #ifdef CFG_HUSH_PARSER #define CFG_PROMPT_HUSH_PS2 "> " #endif diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index 9b950fc5d1..a613850cf1 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -42,11 +42,7 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */ -#endif #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -143,14 +139,10 @@ #define CFG_DISCOVER_PHY #define CONFIG_MII -#if 0 -#define CONFIG_ETHADDR 00:0B:64:00:00:00 /* our OUI from IEEE */ -#endif #define CONFIG_KUP4K_LOGO 0x40050000 /* Address of logo bitmap */ /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#if 1 /* POST support */ #define CONFIG_POST (CFG_POST_CPU | \ @@ -162,7 +154,6 @@ #else #define CFG_CMD_POST_DIAG 0 #endif -#endif #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DATE | \ @@ -253,18 +244,12 @@ #define CFG_ENV_SECT_SIZE 0x10000 /* Address and size of Redundant Environment Sector */ -#if 0 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /*----------------------------------------------------------------------- * Hardware Information Block */ -#if 1 #define CFG_HWINFO_OFFSET 0x000F0000 /* offset of HW Info block */ #define CFG_HWINFO_SIZE 0x00000100 /* size of HW Info block */ #define CFG_HWINFO_MAGIC 0x4B26500D /* 'K&P<CR>' */ -#endif /*----------------------------------------------------------------------- * Cache Configuration */ @@ -480,9 +465,6 @@ #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#if 0 -#define CONFIG_AUTOBOOT_PROMPT "Boote in %d Sekunden - stop mit \"2\"\n" -#endif #define CONFIG_AUTOBOOT_STOP_STR "." /* easy to stop for now */ #define CONFIG_SILENT_CONSOLE 1 diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index cd38b0f2c2..cdf65dfd2a 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -42,11 +42,7 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */ -#endif #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -152,16 +148,12 @@ #define CFG_DISCOVER_PHY #define CONFIG_MII -#if 0 -#define CONFIG_ETHADDR 00:0B:64:80:00:00 /* our OUI from IEEE */ -#endif #undef CONFIG_KUP4K_LOGO /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#if 1 /* POST support */ #define CONFIG_POST (CFG_POST_CPU | \ @@ -173,7 +165,6 @@ #else #define CFG_CMD_POST_DIAG 0 #endif -#endif #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DATE | \ @@ -265,18 +256,12 @@ #define CFG_ENV_SECT_SIZE 0x10000 /* Address and size of Redundant Environment Sector */ -#if 0 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /*----------------------------------------------------------------------- * Hardware Information Block */ -#if 1 #define CFG_HWINFO_OFFSET 0x000F0000 /* offset of HW Info block */ #define CFG_HWINFO_SIZE 0x00000100 /* size of HW Info block */ #define CFG_HWINFO_MAGIC 0x4B26500D /* 'K&P<CR>' */ -#endif /*----------------------------------------------------------------------- * Cache Configuration */ @@ -446,9 +431,6 @@ #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#if 0 -#define CONFIG_AUTOBOOT_PROMPT "Boote in %d Sekunden - stop mit \"2\"\n" -#endif #define CONFIG_AUTOBOOT_STOP_STR "." /* easy to stop for now */ #define CONFIG_SILENT_CONSOLE 1 diff --git a/include/configs/MBX.h b/include/configs/MBX.h index d6e3fb8de9..c958d39704 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -55,11 +55,7 @@ #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ #define CONFIG_8xx_GCLK_FREQ (50000000UL) -#if 1 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_BOOTCOMMAND "bootm 20000" /* autoboot command */ #define CONFIG_BOOTARGS "root=/dev/nfs rw " \ diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index 0ca0970075..3917c33198 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -42,13 +42,8 @@ #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ -#if 1 #define CONFIG_8xx_BOOTDELAY -1 /* autoboot disabled */ #define CONFIG_8xx_TFTP_MODE -#else -#define CONFIG_8xx_BOOTDELAY 5 /* autoboot after 5 seconds */ -#undef CONFIG_8xx_TFTP_MODE -#endif #define CONFIG_DRAM_SPEED (CONFIG_8xx_BUSCLOCK) /* MHz */ #define CONFIG_BOOTCOMMAND "bootm FE020000" /* autoboot command */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 7e57a0fae1..03bd4e9542 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -276,13 +276,6 @@ /*----------------------------------------------------------------------- * POST Configuration */ -#if 0 /* enable this if POST is desired (is supported but not enabled) */ -#define CONFIG_POST (CFG_POST_MEMORY | \ - CFG_POST_CPU | \ - CFG_POST_RTC | \ - CFG_POST_I2C) - -#endif /* * Init Memory Controller: */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 5bed2d0a29..2fceae504a 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -532,42 +532,12 @@ #define CFG_RCWH_PCIHOST 0x80000000 /* PCIHOST */ -#if 1 /*528/264*/ #define CFG_HRCW_LOW (\ HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\ HRCWL_DDR_TO_SCB_CLK_1X1 |\ HRCWL_CSB_TO_CLKIN |\ HRCWL_VCO_1X2 |\ HRCWL_CORE_TO_CSB_2X1) -#elif 0 /*396/132*/ -#define CFG_HRCW_LOW (\ - HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\ - HRCWL_DDR_TO_SCB_CLK_1X1 |\ - HRCWL_CSB_TO_CLKIN |\ - HRCWL_VCO_1X4 |\ - HRCWL_CORE_TO_CSB_3X1) -#elif 0 /*264/132*/ -#define CFG_HRCW_LOW (\ - HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\ - HRCWL_DDR_TO_SCB_CLK_1X1 |\ - HRCWL_CSB_TO_CLKIN |\ - HRCWL_VCO_1X4 |\ - HRCWL_CORE_TO_CSB_2X1) -#elif 0 /*132/132*/ -#define CFG_HRCW_LOW (\ - HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\ - HRCWL_DDR_TO_SCB_CLK_1X1 |\ - HRCWL_CSB_TO_CLKIN |\ - HRCWL_VCO_1X4 |\ - HRCWL_CORE_TO_CSB_1X1) -#elif 0 /*264/264 */ -#define CFG_HRCW_LOW (\ - HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\ - HRCWL_DDR_TO_SCB_CLK_1X1 |\ - HRCWL_CSB_TO_CLKIN |\ - HRCWL_VCO_1X4 |\ - HRCWL_CORE_TO_CSB_1X1) -#endif #if defined(PCI_64BIT) #define CFG_HRCW_HIGH (\ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index cbdbb2921d..bacccd1a3a 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -710,7 +710,6 @@ #define CONFIG_ETH1ADDR 00:E0:0C:00:8C:02 #endif -#if 1 #define CONFIG_IPADDR 10.82.19.159 #define CONFIG_SERVERIP 10.82.48.106 #define CONFIG_GATEWAYIP 10.82.19.254 @@ -722,19 +721,6 @@ #define CONFIG_BOOTFILE timur/uImage #define CONFIG_UBOOTPATH timur/u-boot.bin -#else -#define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_SERVERIP 192.168.1.1 -#define CONFIG_GATEWAYIP 192.168.1.1 -#define CONFIG_NETMASK 255.255.252.0 -#define CONFIG_NETDEV eth0 - -#define CONFIG_HOSTNAME mpc8349emitx -#define CONFIG_ROOTPATH /nfsroot/rootfs -#define CONFIG_BOOTFILE uImage - -#define CONFIG_UBOOTPATH u-boot.bin -#endif #define CONFIG_UBOOTSTART fe700000 #define CONFIG_UBOOTEND fe77ffff diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index d994420096..35dfe25d62 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -110,9 +110,6 @@ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if 0 -#define CFG_HUSH_PARSER 1 /* use "hush" command parser */ -#endif #ifdef CFG_HUSH_PARSER #define CFG_PROMPT_HUSH_PS2 "> " #endif diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index 2e7c505f99..5630e34251 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -171,25 +171,11 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#if 0 /* Use NVRAM for environment variables */ -/*----------------------------------------------------------------------- - * NVRAM organization - */ -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ -#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */ -#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ -#define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */ - -#else /* Use EEPROM for environment variables */ #define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ #define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ -#endif /*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index a933e1b180..875449c564 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -73,11 +73,7 @@ #undef CONFIG_ETHER_PORT_MII /* use RMII */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_PREBOOT "echo;" \ @@ -216,43 +212,25 @@ #define CFG_16BIT_BOOT_PAR 0xc01b5e7c #define CFG_DEV0_PAR CFG_16BIT_BOOT_PAR -#if 0 /* Wrong?? NTL */ -#define CFG_MPP_CONTROL_0 0x53541717 /* InitAct EOT[4] DBurst TCEn[1] */ - /* DMAAck[1:0] GNT0[1:0] */ -#else #define CFG_MPP_CONTROL_0 0x53547777 /* InitAct EOT[4] DBurst TCEn[1] */ /* REQ0[1:0] GNT0[1:0] */ -#endif #define CFG_MPP_CONTROL_1 0x44009911 /* TCEn[4] TCTcnt[4] GPP[13:12] */ /* DMAReq[4] DMAAck[4] WDNMI WDE */ -#if 0 /* Wrong?? NTL */ -#define CFG_MPP_CONTROL_2 0x40091818 /* TCTcnt[0] GPP[22:21] BClkIn */ - /* DMAAck[1:0] GNT1[1:0] */ -#else #define CFG_MPP_CONTROL_2 0x40098888 /* TCTcnt[0] */ /* GPP[22] (RS232IntB or PCI1Int) */ /* GPP[21] (RS323IntA) */ /* BClkIn */ /* REQ1[1:0] GNT1[1:0] */ -#endif -#if 0 /* Wrong?? NTL */ -# define CFG_MPP_CONTROL_3 0x00090066 /* GPP[31:29] BClkOut0 */ - /* GPP[27:26] Int[1:0] */ -#else # define CFG_MPP_CONTROL_3 0x22090066 /* MREQ MGNT */ /* GPP[29] (PCI1Int) */ /* BClkOut0 */ /* GPP[27] (PCI0Int) */ /* GPP[26] (RtcInt or PCI1Int) */ /* CPUInt[25:24] */ -#endif #define CFG_SERIAL_PORT_MUX 0x00001102 /* 11=MPSC1/MPSC0 02=ETH 0 and 2 RMII */ -#if 0 /* Wrong?? - NTL */ -# define CFG_GPP_LEVEL_CONTROL 0x000002c6 -#else # define CFG_GPP_LEVEL_CONTROL 0x2c600000 /* 0010 1100 0110 0000 */ /* gpp[29] */ /* gpp[27:26] */ @@ -273,18 +251,9 @@ virtual interleaving enable */ /* 15 14 13:0 */ /* 1 0 0x200 */ -#endif -#if 0 -#define CFG_DUART_IO CFG_DEV2_SPACE -#define CFG_DUART_CHAN 1 /* channel to use for console */ -#endif #undef CFG_INIT_CHAN1 #undef CFG_INIT_CHAN2 -#if 0 -#define SRAM_BASE CFG_DEV0_SPACE -#define SRAM_SIZE 0x00100000 /* 1 MB of sram */ -#endif /*----------------------------------------------------------------------- diff --git a/include/configs/PATI.h b/include/configs/PATI.h index d88fff33ea..8f6abcfb43 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -48,11 +48,7 @@ /* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_BOOTCOMMAND "" /* autoboot command */ #define CONFIG_BOOTARGS "" /* */ diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h index 6e0bd7f23e..3e7d1154cf 100644 --- a/include/configs/PMC405.h +++ b/include/configs/PMC405.h @@ -169,15 +169,9 @@ #define CFG_PCI_PTM1LA (bd->bi_memstart) /* point to sdram */ #define CFG_PCI_PTM1MS (~(bd->bi_memsize - 1) | 1) /* memsize, enable hard-wired to 1 */ #define CFG_PCI_PTM1PCI 0x00000000 /* Host: use this pci address */ -#if 1 #define CFG_PCI_PTM2LA 0xef000000 /* point to internal regs */ #define CFG_PCI_PTM2MS 0xff000001 /* 16MB, enable */ #define CFG_PCI_PTM2PCI 0x00000000 /* Host: use this pci address */ -#else /* old mapping */ -#define CFG_PCI_PTM2LA 0xffc00000 /* point to flash */ -#define CFG_PCI_PTM2MS 0xffc00001 /* 4MB, enable */ -#define CFG_PCI_PTM2PCI 0x04000000 /* Host: use this pci address */ -#endif /*----------------------------------------------------------------------- * Start addresses for the final memory configuration * (Set up by the startup code) diff --git a/include/configs/PN62.h b/include/configs/PN62.h index a717659bb6..6848f7d5c8 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -63,16 +63,6 @@ #define CONFIG_ROOTPATH /opt/eldk/ppc_82xx #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_BOOTARGS -#if 0 -/* Boot Linux with NFS root filesystem */ -#define CONFIG_BOOTCOMMAND \ - "setenv verify y;" \ - "setenv bootargs console=ttyS0,19200 mem=31M quiet " \ - "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \ - "loadp 100000; bootm" - /* "tftpboot 100000 uImage; bootm" */ -#else /* Boot Linux with RAMdisk based filesystem (initrd, BusyBox) */ #define CONFIG_BOOTCOMMAND \ "setenv verify n;" \ @@ -80,7 +70,6 @@ "root=/dev/ram rw " \ "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \ "loadp 200000; bootm" -#endif /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> @@ -111,9 +100,6 @@ */ #define CONFIG_PCI /* include pci support */ #define CONFIG_PCI_PNP /* we need Plug 'n Play */ -#if 0 -#define CONFIG_PCI_SCAN_SHOW /* show PCI auto-scan at boot */ -#endif /* * Networking stuff diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index f8e3397a3f..3974a0dd21 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -145,11 +145,7 @@ #define CFG_OR4_PRELIM 0xfc000cc1 #define CFG_BR5_PRELIM 0xfc000801 /* 16M CS5 misc devices */ -#if 1 #define CFG_OR5_PRELIM 0xff000ff7 -#else - #define CFG_OR5_PRELIM 0xff0000f0 -#endif #define CFG_BR6_PRELIM 0xe0001801 /* 64M, 32-bit flash */ #define CFG_OR6_PRELIM 0xfc000ff7 @@ -188,25 +184,16 @@ #define CFG_NS16550 #define CFG_NS16550_SERIAL #define CFG_NS16550_REG_SIZE 1 -#if 0 -#define CFG_NS16550_CLK 1843200 /* get_bus_freq(0) */ -#else #define CFG_NS16550_CLK 264000000 /* get_bus_freq(0) */ -#endif #define CONFIG_BAUDRATE 9600 #define CFG_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} -#if 0 -#define CFG_NS16550_COM1 ((CFG_BR5_PRELIM & 0xff000000)+0x00700000) -#define CFG_NS16550_COM2 ((CFG_BR5_PRELIM & 0xff000000)+0x00800000) -#else /* SBC8540 uses internal COMM controller */ #define CFG_NS16550_COM1 ((CFG_CCSRBAR & 0xfff00000)+0x00004500) #define CFG_NS16550_COM2 ((CFG_CCSRBAR & 0xfff00000)+0x00004600) -#endif /* Use the HUSH parser */ #define CFG_HUSH_PARSER @@ -289,10 +276,6 @@ #define CFG_FLASH_CFI 1 /* Flash is CFI conformant */ #define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */ -#if 0 -#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ -#define CFG_FLASH_PROTECTION /* use hardware protection */ -#endif #define CFG_MAX_FLASH_SECT 64 /* max number of sectors on one chip */ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ @@ -302,14 +285,6 @@ #define CFG_MONITOR_BASE TEXT_BASE /* start of monitor */ -#if 0 -/* XXX This doesn't work and I don't want to fix it */ -#if (CFG_MONITOR_BASE < CFG_FLASH_BASE) - #define CFG_RAMBOOT -#else - #undef CFG_RAMBOOT -#endif -#endif /* Environment */ #if !defined(CFG_RAMBOOT) diff --git a/include/configs/SBC8560.h b/include/configs/SBC8560.h index 8b46a17ed5..cc66640b4d 100644 --- a/include/configs/SBC8560.h +++ b/include/configs/SBC8560.h @@ -144,11 +144,7 @@ #define CFG_OR4_PRELIM 0xfc000cc1 #define CFG_BR5_PRELIM 0xfc000801 /* 16M CS5 misc devices */ -#if 1 #define CFG_OR5_PRELIM 0xff000ff7 -#else - #define CFG_OR5_PRELIM 0xff0000f0 -#endif #define CFG_BR6_PRELIM 0xe0001801 /* 64M, 32-bit flash */ #define CFG_OR6_PRELIM 0xfc000ff7 @@ -273,10 +269,6 @@ #define CFG_FLASH_CFI 1 /* Flash is CFI conformant */ #define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */ -#if 0 -#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ -#define CFG_FLASH_PROTECTION /* use hardware protection */ -#endif #define CFG_MAX_FLASH_SECT 64 /* max number of sectors on one chip */ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ @@ -286,14 +278,6 @@ #define CFG_MONITOR_BASE TEXT_BASE /* start of monitor */ -#if 0 -/* XXX This doesn't work and I don't want to fix it */ -#if (CFG_MONITOR_BASE < CFG_FLASH_BASE) - #define CFG_RAMBOOT -#else - #undef CFG_RAMBOOT -#endif -#endif /* Environment */ #if !defined(CFG_RAMBOOT) diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 4977629121..84b1bf1593 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -42,11 +42,7 @@ #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index ae4dcc2ccc..ad88cb0318 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -40,11 +40,7 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index a8454d99fc..d110014067 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -75,11 +75,7 @@ #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_HAS_ETH1 @@ -451,11 +447,9 @@ #define CFG_ENV_SIZE 1024 /* Use only a part of it*/ #endif -#if 1 #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ #define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n" #define CONFIG_AUTOBOOT_DELAY_STR "delayabit" #define CONFIG_AUTOBOOT_STOP_STR " " /* easy to stop for now */ -#endif #endif /* __CONFIG_H */ diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 8a6e5a61b7..b9edf078f6 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -59,7 +59,6 @@ /* * Video console */ -#if 1 #define CONFIG_VIDEO #define CONFIG_VIDEO_SM501 #define CONFIG_VIDEO_SM501_32BPP @@ -70,7 +69,6 @@ #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CFG_CONSOLE_IS_IN_ENV -#endif #ifdef CONFIG_VIDEO #define ADD_BMP_CMD CFG_CMD_BMP diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index f41dbd0ccb..e44dde5424 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -253,18 +253,6 @@ /* * DRAM configuration - will be read from VPD later... TODO! */ -#if 0 -/* 2x MT48LC16M16A2 - 7.0 ns SDRAMS = 64 MegaBytes Total */ -#define CFG_DRAM_DDR 0 -#define CFG_DRAM_EMODE 0 -#define CFG_DRAM_MODE 0x008D -#define CFG_DRAM_CONTROL 0x514F0000 -#define CFG_DRAM_CONFIG1 0xC2233A00 -#define CFG_DRAM_CONFIG2 0x88B70004 -#define CFG_DRAM_TAP_DEL 0x08 -#define CFG_DRAM_RAM_SIZE 0x19 -#endif -#if 1 /* 2x MT48LC16M16A2 - 7.5 ns SDRAMS = 64 MegaBytes Total */ #define CFG_DRAM_DDR 0 #define CFG_DRAM_EMODE 0 @@ -274,7 +262,6 @@ #define CFG_DRAM_CONFIG2 0x8AD70004 #define CFG_DRAM_TAP_DEL 0x08 #define CFG_DRAM_RAM_SIZE 0x19 -#endif /* * Environment settings diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 925bf34317..a66a7da0a5 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -237,7 +237,6 @@ #define CFG_MDC_PIN 0x00000001 /* PC31 */ #endif -#if 1 #define MDIO_ACTIVE (iop->pdir |= CFG_MDIO_PIN) #define MDIO_TRISTATE (iop->pdir &= ~CFG_MDIO_PIN) #define MDIO_READ ((iop->pdat & CFG_MDIO_PIN) != 0) @@ -247,17 +246,6 @@ #define MDC(bit) if(bit) iop->pdat |= CFG_MDC_PIN; \ else iop->pdat &= ~CFG_MDC_PIN -#else -#define MDIO_ACTIVE ({unsigned long tmp; tmp = iop->pdir; tmp |= CFG_MDIO_PIN; iop->pdir = tmp;}) -#define MDIO_TRISTATE ({unsigned long tmp; tmp = iop->pdir; tmp &= ~CFG_MDIO_PIN; iop->pdir = tmp;}) -#define MDIO_READ ((iop->pdat & CFG_MDIO_PIN) != 0) - -#define MDIO(bit) if(bit) {unsigned long tmp; tmp = iop->pdat; tmp |= CFG_MDIO_PIN; iop->pdat = tmp;}\ - else {unsigned long tmp; tmp = iop->pdat; tmp &= ~CFG_MDIO_PIN; iop->pdat = tmp;} - -#define MDC(bit) if(bit) {unsigned long tmp; tmp = iop->pdat; tmp |= CFG_MDC_PIN; iop->pdat = tmp;}\ - else {unsigned long tmp; tmp = iop->pdat; tmp &= ~CFG_MDC_PIN; iop->pdat = tmp;} -#endif #define MIIDELAY udelay(1) @@ -293,13 +281,6 @@ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if 0 -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CFG_HUSH_PARSER 1 /* Use the HUSH parser */ -#ifdef CFG_HUSH_PARSER -#define CFG_PROMPT_HUSH_PS2 "> " -#endif -#endif #if (CONFIG_COMMANDS & CFG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ @@ -448,13 +429,7 @@ * defines for the various registers affected by the HRCW e.g. changing * HRCW_DPPCxx requires you to also change CFG_SIUMCR. */ -#if 0 -#define __HRCW__ALL__ (HRCW_CIP | HRCW_ISB111 | HRCW_BMS) - -# define CFG_HRCW_MASTER (__HRCW__ALL__ | HRCW_MODCK_H0111) -#else #define CFG_HRCW_MASTER (HRCW_BPS11 | HRCW_ISB111 | HRCW_BMS | HRCW_MODCK_H0111) -#endif /* no slaves so just fill with zeros */ #define CFG_HRCW_SLAVE1 0 diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 50df49e93c..b19285bd43 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -110,11 +110,6 @@ #define CFG_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ #define CFG_I2C_EEPROM_ADDR_LEN 2 /* two byte address */ -#if 0 -#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */ -#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x01 -#define CFG_EEPROM_PAGE_WRITE_BITS 5 -#endif #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 8175703236..9f2b30026f 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -63,7 +63,6 @@ /* * Video console */ -#if 1 #define CONFIG_VIDEO #define CONFIG_VIDEO_SED13806 #define CONFIG_VIDEO_SED13806_16BPP @@ -77,9 +76,6 @@ #define CONFIG_SPLASH_SCREEN #define ADD_VIDEO_CMD CFG_CMD_BMP -#else -#define ADD_VIDEO_CMD 0 -#endif #ifdef CONFIG_MPC5200 /* MGT5100 PCI is not supported yet. */ /* @@ -119,13 +115,9 @@ #define CONFIG_DOS_PARTITION /* USB */ -#if 1 #define CONFIG_USB_OHCI #define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT #define CONFIG_USB_STORAGE -#else -#define ADD_USB_CMD 0 -#endif /* * Supported commands diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index f163d003b9..cbfd07258c 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -80,11 +80,7 @@ /* define this if you want to enable GT MAC filtering */ #define CONFIG_GT_USE_MAC_HASH_TABLE -#if 1 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_ZERO_BOOTDELAY_CHECK #undef CONFIG_BOOTARGS diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 458ebabeb9..90c74e52a6 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -126,10 +126,6 @@ #define CONFIG_NR_DRAM_BANKS 1 /* External flash on STK1000 */ -#if 0 -#define CFG_FLASH_CFI 1 -#define CFG_FLASH_CFI_DRIVER 1 -#endif #define CFG_FLASH_BASE 0x00000000 #define CFG_FLASH_SIZE 0x800000 diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 27d64c1e43..83247862f7 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -45,32 +45,17 @@ * */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 3 /* autoboot after X seconds */ -#endif #define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress when bootdelay = 0 */ -#if 1 #undef CONFIG_BOOTARGS #define CONFIG_BOOTCOMMAND \ "setenv bootargs console=ttyS0,38400 debug " \ "root=/dev/ram rw ramdisk_size=4096 " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ "bootm fe000000 fe100000" -#endif -#if 0 -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTCOMMAND \ - "bootp; " \ - "setenv bootargs console=ttyS0,38400 debug " \ - "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ - "bootm" -#endif /* * BOOTP/DHCP protocol configuration diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 09d52ded9e..0218a69721 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -45,32 +45,17 @@ * */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 3 /* autoboot after X seconds */ -#endif #define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress when bootdelay = 0 */ -#if 1 #undef CONFIG_BOOTARGS #define CONFIG_BOOTCOMMAND \ "setenv bootargs console=ttyS0,38400 debug " \ "root=/dev/ram rw ramdisk_size=4096 " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ "bootm ff800000 ff900000" -#endif -#if 0 -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTCOMMAND \ - "bootp; " \ - "setenv bootargs console=ttyS0,38400 debug " \ - "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ - "bootm" -#endif /* * BOOTP/DHCP protocol configuration diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index a014c7c07f..c22391dab8 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -286,12 +286,6 @@ #define CFG_ACTORW 5 /* Activate to R/W */ #define CFG_SDMODE_CAS_LAT 3 /* SDMODE CAS latency */ #else -#if 0 -#define CFG_PRETOACT 2 /* Precharge to activate interval */ -#define CFG_ACTTOPRE 3 /* Activate to Precharge interval */ -#define CFG_ACTORW 3 /* Activate to R/W */ -#define CFG_SDMODE_CAS_LAT 2 /* SDMODE CAS latency */ -#endif #define CFG_PRETOACT 2 /* Precharge to activate interval */ #define CFG_ACTTOPRE 5 /* Activate to Precharge interval */ #define CFG_ACTORW 3 /* Activate to R/W */ diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index a77ccef63b..c4134f3a24 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -181,11 +181,7 @@ * Define here the location of the environment variables (FLASH or EEPROM). * Note: DENX encourages to use redundant environment in FLASH. */ -#if 1 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#else -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#endif /*----------------------------------------------------------------------- * FLASH related diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h index 7f3dfd5c98..a5373ce927 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -47,11 +47,6 @@ #define BOARD_LATE_INIT 1 #define USE_920T_MMU 1 -#if 0 -#define CFG_MX1_GPCR 0x000003AB /* for MX1ADS 0L44N */ -#define CFG_MX1_GPCR 0x000003AB /* for MX1ADS 0L44N */ -#define CFG_MX1_GPCR 0x000003AB /* for MX1ADS 0L44N */ -#endif /* * Size of malloc() pool diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h index 6787b1928a..2942be84f2 100644 --- a/include/configs/omap1510.h +++ b/include/configs/omap1510.h @@ -534,19 +534,6 @@ #define CAM_GPIO_REG (CAMERA_BASE + 0x14) #define CAM_PEAK_CTR_REG (CAMERA_BASE + 0x18) -#if 0 -#ifndef __ASSEMBLY__ -typedef struct { - __u32 ctrlclock; - __u32 it_status; - __u32 mode; - __u32 status; - __u32 camdata; - __u32 gpio; - __u32 peak_counter; -} camera_regs_t; -#endif -#endif /* CTRLCLOCK bit shifts */ #define FOSCMOD_BIT 0 diff --git a/include/configs/quantum.h b/include/configs/quantum.h index 21ec5acade..84db5a5df5 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -43,11 +43,7 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 9600 /* console baudrate = 9600bps */ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif /* default developmenmt environment */ @@ -81,11 +77,7 @@ /* M48T02 Paralled access timekeeper with same interface as the M48T35A*/ #define CONFIG_RTC_M48T35A 1 -#if 0 -#define CONFIG_WATCHDOG 1 /* watchdog enabled */ -#else #undef CONFIG_WATCHDOG -#endif /* NVRAM and RTC */ #define CFG_NVRAM_BASE_ADDR 0xFA000000 @@ -158,11 +150,7 @@ #define CFG_SDRAM_BASE 0x00000000 #define CFG_FLASH_BASE 0xFF000000 -#if 1 #define CFG_FLASH_CFI_DRIVER -#else - #undef CFG_FLASH_CFI_DRIVER -#endif #ifdef CFG_FLASH_CFI_DRIVER diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 6e4fdb2498..b9d3806027 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -139,11 +139,7 @@ #define CFG_OR4_PRELIM 0xfc000cc1 #define CFG_BR5_PRELIM 0xfc000801 /* 16M CS5 misc devices */ -#if 1 #define CFG_OR5_PRELIM 0xff000ff7 -#else - #define CFG_OR5_PRELIM 0xff0000f0 -#endif #define CFG_BR6_PRELIM 0xe0001801 /* 64M, 32-bit flash */ #define CFG_OR6_PRELIM 0xfc000ff7 @@ -271,10 +267,6 @@ #define CFG_FLASH_CFI 1 /* Flash is CFI conformant */ #define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */ -#if 0 -#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ -#define CFG_FLASH_PROTECTION /* use hardware protection */ -#endif #define CFG_MAX_FLASH_SECT 64 /* max number of sectors on one chip */ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ @@ -284,14 +276,6 @@ #define CFG_MONITOR_BASE TEXT_BASE /* start of monitor */ -#if 0 -/* XXX This doesn't work and I don't want to fix it */ -#if (CFG_MONITOR_BASE < CFG_FLASH_BASE) - #define CFG_RAMBOOT -#else - #undef CFG_RAMBOOT -#endif -#endif /* Environment */ #if !defined(CFG_RAMBOOT) diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index e7f0108892..575373972a 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -249,11 +249,7 @@ "" #define CONFIG_BOOTCOMMAND "run flash_self" -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 9d3609a67d..8ffcd2f49e 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -56,11 +56,7 @@ #define CONFIG_BOARD_EARLY_INIT_F -#if 1 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/spieval.h b/include/configs/spieval.h index f40dde2ac8..417fde4068 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -97,7 +97,6 @@ /* * Video console */ -#if 1 #define CONFIG_VIDEO #define CONFIG_VIDEO_SM501 #define CONFIG_VIDEO_SM501_32BPP @@ -108,7 +107,6 @@ #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CFG_CONSOLE_IS_IN_ENV -#endif #ifdef CONFIG_VIDEO #define ADD_BMP_CMD CFG_CMD_BMP diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 614a046105..916952c1fd 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -53,11 +53,7 @@ #define CONFIG_8xx_GCLK_FREQ MPC8XX_HZ -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #undef CONFIG_CLOCKS_IN_MHZ /* clocks NOT passsed to Linux in MHz */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index c4e629ade2..bbeeeb8c57 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -149,9 +149,6 @@ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if 0 -#define CFG_HUSH_PARSER 1 /* use "hush" command parser */ -#endif #ifdef CFG_HUSH_PARSER #define CFG_PROMPT_HUSH_PS2 "> " #endif diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 06d8536ec3..17fe441e45 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -124,9 +124,6 @@ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if 0 -#define CFG_HUSH_PARSER 1 /* use "hush" command parser */ -#endif #ifdef CFG_HUSH_PARSER #define CFG_PROMPT_HUSH_PS2 "> " #endif diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h index 4e97b01aa1..0f6d623c58 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -205,11 +205,9 @@ #ifndef VOICEBLUE_SMALL_FLASH #define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ -#if 1 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ #define CONFIG_AUTOBOOT_PROMPT "\nVoiceBlue Enterprise - booting...\n" #define CONFIG_AUTOBOOT_DELAY_STR "." /* 1st "password" */ -#endif /* * JFFS2 partitions (mtdparts command line support) diff --git a/include/configs/yellowstone.h b/include/configs/yellowstone.h index 58717f8a60..1705d6eb22 100644 --- a/include/configs/yellowstone.h +++ b/include/configs/yellowstone.h @@ -92,11 +92,7 @@ * Define here the location of the environment variables (FLASH or EEPROM). * Note: DENX encourages to use redundant environment in FLASH. */ -#if 1 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#else -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#endif /*----------------------------------------------------------------------- * FLASH related @@ -187,11 +183,7 @@ "" #define CONFIG_BOOTCOMMAND "run flash_self" -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 6e942abcaa..59880fa5e4 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -92,11 +92,7 @@ * Define here the location of the environment variables (FLASH or EEPROM). * Note: DENX encourages to use redundant environment in FLASH. */ -#if 1 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#else -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#endif /*----------------------------------------------------------------------- * FLASH related @@ -187,11 +183,7 @@ "" #define CONFIG_BOOTCOMMAND "run flash_self" -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_BAUDRATE 115200 |