include/configs: Use new CONFIG_CMD_* in various s* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
master
Jon Loeliger 17 years ago committed by Wolfgang Denk
parent 90cc3eb6d2
commit 46da1e96b7
  1. 53
      include/configs/sacsng.h
  2. 48
      include/configs/sc3.h
  3. 17
      include/configs/sc520_cdp.h
  4. 17
      include/configs/sc520_spunk.h
  5. 24
      include/configs/scb9328.h
  6. 59
      include/configs/sequoia.h
  7. 14
      include/configs/shannon.h
  8. 29
      include/configs/smdk2400.h
  9. 29
      include/configs/smdk2410.h
  10. 47
      include/configs/smmaco4.h
  11. 53
      include/configs/sorcery.h
  12. 34
      include/configs/spc1920.h
  13. 89
      include/configs/spieval.h
  14. 8
      include/configs/suzaku.h
  15. 25
      include/configs/svm_sc8xx.h

@ -502,31 +502,28 @@
*/ */
#define CONFIG_VERSION_VARIABLE #define CONFIG_VERSION_VARIABLE
/* What U-Boot subsytems do you want enabled? */
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_ELF
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_I2C
#define CONFIG_CMD_SPI
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_IMMAP
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_PING
#undef CONFIG_CMD_KGDB
#ifdef CONFIG_ETHER_ON_FCC #ifdef CONFIG_ETHER_ON_FCC
# define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \ #define CONFIG_CMD_MII
CFG_CMD_ELF | \ #endif
CFG_CMD_ASKENV | \
CFG_CMD_I2C | \
CFG_CMD_SPI | \
CFG_CMD_SDRAM | \
CFG_CMD_REGINFO | \
CFG_CMD_IMMAP | \
CFG_CMD_IRQ | \
CFG_CMD_PING | \
CFG_CMD_MII )
#else
# define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
CFG_CMD_ELF | \
CFG_CMD_ASKENV | \
CFG_CMD_I2C | \
CFG_CMD_SPI | \
CFG_CMD_SDRAM | \
CFG_CMD_REGINFO | \
CFG_CMD_IMMAP | \
CFG_CMD_IRQ | \
CFG_CMD_PING )
#endif /* CONFIG_ETHER_ON_FCC */
/* Where do the internal registers live? */ /* Where do the internal registers live? */
#define CFG_IMMR 0xF0000000 #define CFG_IMMR 0xF0000000
@ -544,10 +541,6 @@
#define CONFIG_SACSng 1 /* munged for the SACSng */ #define CONFIG_SACSng 1 /* munged for the SACSng */
#define CONFIG_CPM2 1 /* Has a CPM2 */ #define CONFIG_CPM2 1 /* Has a CPM2 */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
@ -589,7 +582,7 @@
#define CFG_TFTP_TIMEOUT_COUNT 5 /* How many timeouts TFTP will allow */ #define CFG_TFTP_TIMEOUT_COUNT 5 /* How many timeouts TFTP will allow */
/* before it gives up. */ /* before it gives up. */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
# define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ # define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
# define CFG_CBSIZE 256 /* Console I/O Buffer Size */ # define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -732,7 +725,7 @@
*/ */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif #endif

@ -169,25 +169,27 @@
#define CONFIG_MII 1 /* add 405GP MII PHY management */ #define CONFIG_MII 1 /* add 405GP MII PHY management */
#define CONFIG_PHY_ADDR 1 /* the connected Phy defaults to address 1 */ #define CONFIG_PHY_ADDR 1 /* the connected Phy defaults to address 1 */
#define CONFIG_COMMANDS \ /*
(CONFIG_CMD_DFL | \ * Command line configuration.
CFG_CMD_AUTOSCRIPT | \ */
CFG_CMD_PCI | \ #include <config_cmd_default.h>
CFG_CMD_IRQ | \
CFG_CMD_NET | \
CFG_CMD_MII | \ #define CONFIG_CMD_AUTOSCRIPT
CFG_CMD_PING | \ #define CONFIG_CMD_PCI
CFG_CMD_NAND | \ #define CONFIG_CMD_IRQ
CFG_CMD_JFFS2 | \ #define CONFIG_CMD_NET
CFG_CMD_I2C | \ #define CONFIG_CMD_MII
CFG_CMD_IDE | \ #define CONFIG_CMD_PING
CFG_CMD_DATE | \ #define CONFIG_CMD_NAND
CFG_CMD_DHCP | \ #define CONFIG_CMD_JFFS2
CFG_CMD_CACHE | \ #define CONFIG_CMD_I2C
CFG_CMD_ELF ) #define CONFIG_CMD_IDE
#define CONFIG_CMD_DATE
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #define CONFIG_CMD_DHCP
#include <cmd_confdefs.h> #define CONFIG_CMD_CACHE
#define CONFIG_CMD_ELF
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
@ -277,7 +279,7 @@
* External peripheral base address * External peripheral base address
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
#if !(CONFIG_COMMANDS & CFG_CMD_IDE) #if !defined(CONFIG_CMD_IDE)
#undef CONFIG_IDE_LED /* no led for ide supported */ #undef CONFIG_IDE_LED /* no led for ide supported */
#undef CONFIG_IDE_RESET /* no reset for ide supported */ #undef CONFIG_IDE_RESET /* no reset for ide supported */
@ -286,7 +288,7 @@
* IDE/ATA stuff * IDE/ATA stuff
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
#else /* !(CONFIG_COMMANDS & CFG_CMD_IDE) */ #else
#define CONFIG_START_IDE 1 /* check, if use IDE */ #define CONFIG_START_IDE 1 /* check, if use IDE */
#undef CONFIG_IDE_8xx_DIRECT /* no pcmcia interface required */ #undef CONFIG_IDE_8xx_DIRECT /* no pcmcia interface required */
@ -346,7 +348,7 @@
#endif /* IDE_USES_ISA_EMULATION */ #endif /* IDE_USES_ISA_EMULATION */
#endif /* !(CONFIG_COMMANDS & CFG_CMD_IDE) */ #endif
/* /*
#define CFG_KEY_REG_BASE_ADDR 0xF0100000 #define CFG_KEY_REG_BASE_ADDR 0xF0100000
@ -437,7 +439,7 @@ extern unsigned long offsetOfEnvironment;
#define CFG_CACHELINE_SIZE 32 #define CFG_CACHELINE_SIZE 32
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif #endif

@ -67,16 +67,25 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_JFFS2 | CFG_CMD_IDE | CFG_CMD_NET | CFG_CMD_EEPROM)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /*
#include <cmd_confdefs.h> * Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_PCI
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_IDE
#define CONFIG_CMD_NET
#define CONFIG_CMD_EEPROM
#define CONFIG_BOOTDELAY 15 #define CONFIG_BOOTDELAY 15
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyS0,9600" #define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyS0,9600"
/* #define CONFIG_BOOTCOMMAND "bootm 38000000" */ /* #define CONFIG_BOOTCOMMAND "bootm 38000000" */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif

@ -64,16 +64,25 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_JFFS2 | CFG_CMD_IDE | CFG_CMD_NET | CFG_CMD_PCMCIA | CFG_CMD_EEPROM)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /*
#include <cmd_confdefs.h> * Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_PCI
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_IDE
#define CONFIG_CMD_NET
#define CONFIG_CMD_PCMCIA
#define CONFIG_CMD_EEPROM
#define CONFIG_BOOTDELAY 15 #define CONFIG_BOOTDELAY 15
#define CONFIG_BOOTARGS "root=/dev/mtdblock1 console=ttyS0,9600 mtdparts=phys:7936k(root),256k(uboot) " #define CONFIG_BOOTARGS "root=/dev/mtdblock1 console=ttyS0,9600 mtdparts=phys:7936k(root),256k(uboot) "
#define CONFIG_BOOTCOMMAND "setenv bootargs root=/dev/nfs ip=autoconf console=ttyS0,9600 mtdparts=phys:7808k(root),128k(env),256k(uboot); bootp; bootm" #define CONFIG_BOOTCOMMAND "setenv bootargs root=/dev/nfs ip=autoconf console=ttyS0,9600 mtdparts=phys:7808k(root),128k(env),256k(uboot); bootp; bootm"
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif

@ -36,20 +36,18 @@
/* /*
* Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if * Command line configuration.
* neccessary in include/cmd_confdefs.h file. (Un)comment for getting
* functionality or size of u-boot code.
*/ */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ #include <config_cmd_default.h>
& ~CFG_CMD_LOADS \
& ~CFG_CMD_CONSOLE \ #define CONFIG_CMD_NET
& ~CFG_CMD_AUTOSCRIPT \ #define CONFIG_CMD_PING
| CFG_CMD_NET \ #define CONFIG_CMD_DHCP
| CFG_CMD_PING \
| CFG_CMD_DHCP \ #undef CONFIG_CMD_LOADS
) #undef CONFIG_CMD_CONSOLE
#undef CONFIG_CMD_AUTOSCRIPT
#include <cmd_confdefs.h>
/* /*
* Boot options. Setting delay to -1 stops autostart count down. * Boot options. Setting delay to -1 stops autostart count down.

@ -299,9 +299,6 @@
/* Comment this out to enable USB 1.1 device */ /* Comment this out to enable USB 1.1 device */
#define USB_2_0_DEVICE #define USB_2_0_DEVICE
#define CMD_USB CFG_CMD_USB
#else
#define CMD_USB 0 /* no USB on 440GRx */
#endif /* CONFIG_440EPX */ #endif /* CONFIG_440EPX */
/* Partitions */ /* Partitions */
@ -309,25 +306,34 @@
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_ISO_PARTITION #define CONFIG_ISO_PARTITION
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ /*
CFG_CMD_DHCP | \ * Command line configuration.
CFG_CMD_DTT | \ */
CFG_CMD_DIAG | \ #include <config_cmd_default.h>
CFG_CMD_EEPROM | \
CFG_CMD_ELF | \ #define CONFIG_CMD_ASKENV
CFG_CMD_FAT | \ #define CONFIG_CMD_DHCP
CFG_CMD_I2C | \ #define CONFIG_CMD_DTT
CFG_CMD_IRQ | \ #define CONFIG_CMD_DIAG
CFG_CMD_MII | \ #define CONFIG_CMD_EEPROM
CFG_CMD_NAND | \ #define CONFIG_CMD_ELF
CFG_CMD_NET | \ #define CONFIG_CMD_FAT
CFG_CMD_NFS | \ #define CONFIG_CMD_I2C
CFG_CMD_PCI | \ #define CONFIG_CMD_IRQ
CFG_CMD_PING | \ #define CONFIG_CMD_MII
CFG_CMD_REGINFO | \ #define CONFIG_CMD_NAND
CFG_CMD_SDRAM | \ #define CONFIG_CMD_NET
CMD_USB) #define CONFIG_CMD_NFS
#define CONFIG_CMD_PCI
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SDRAM
#ifdef CONFIG_440EPX
#define CONFIG_CMD_USB
#endif
/* POST support */ /* POST support */
#define CONFIG_POST (CFG_POST_MEMORY | \ #define CONFIG_POST (CFG_POST_MEMORY | \
@ -343,15 +349,12 @@
#define CONFIG_SUPPORT_VFAT #define CONFIG_SUPPORT_VFAT
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Miscellaneous configurable options * Miscellaneous configurable options
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -441,7 +444,7 @@
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
#define CFG_DCACHE_SIZE (32<<10) /* For AMCC 440 CPUs */ #define CFG_DCACHE_SIZE (32<<10) /* For AMCC 440 CPUs */
#define CFG_CACHELINE_SIZE 32 /* ... */ #define CFG_CACHELINE_SIZE 32 /* ... */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif #endif
@ -453,7 +456,7 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define BOOTFLAG_WARM 0x02 /* Software reboot */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif

@ -66,21 +66,19 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#if 0 /* XXX - cannot test IDE anyway, so disabled for now - wd */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_PCMCIA | \
CFG_CMD_IDE)
#endif /* 0 */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /*
#include <cmd_confdefs.h> * Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,115200" #define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,115200"
#define CONFIG_NETMASK 255.255.0.0 #define CONFIG_NETMASK 255.255.0.0
#define CONFIG_BOOTCOMMAND "help" #define CONFIG_BOOTCOMMAND "help"
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif

@ -86,24 +86,23 @@
/* Use s3c2400's RTC */ /* Use s3c2400's RTC */
#define CONFIG_RTC_S3C24X0 1 #define CONFIG_RTC_S3C24X0 1
#ifndef USE_920T_MMU
#define CONFIG_COMMANDS_tmp ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ /*
CFG_CMD_DATE | \ * Command line configuration.
CFG_CMD_SNTP ) */
#else #include <config_cmd_default.h>
#define CONFIG_COMMANDS_tmp (CONFIG_CMD_DFL | \
CFG_CMD_DATE | \ #define CONFIG_CMD_DATE
CFG_CMD_SNTP ) #define CONFIG_CMD_SNTP
#if defined(CONFIG_HWFLOW)
#define CONFIG_CONFIG_HWFLOW
#endif #endif
#ifdef CONFIG_HWFLOW #if !defined(USE_920T_MMU)
#define CONFIG_COMMANDS (CONFIG_COMMANDS_tmp | CFG_CMD_HWFLOW) #undef CONFIG_CMD_CACHE
#else
#define CONFIG_COMMANDS CONFIG_COMMANDS_tmp
#endif #endif
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#if 0 #if 0
@ -118,7 +117,7 @@
#define CONFIG_BOOTCOMMAND "tftp; bootm" #define CONFIG_BOOTCOMMAND "tftp; bootm"
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
/* what's this ? it's not used anywhere */ /* what's this ? it's not used anywhere */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */

@ -72,22 +72,17 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/***********************************************************
* Command definition /*
***********************************************************/ * Command line configuration.
#define CONFIG_COMMANDS \ */
(CONFIG_CMD_DFL | \ #include <config_cmd_default.h>
CFG_CMD_CACHE | \
/*CFG_CMD_NAND |*/ \ #define CONFIG_CMD_CACHE
/*CFG_CMD_EEPROM |*/ \ #define CONFIG_CMD_REGINFO
/*CFG_CMD_I2C |*/ \ #define CONFIG_CMD_DATE
/*CFG_CMD_USB |*/ \ #define CONFIG_CMD_ELF
CFG_CMD_REGINFO | \
CFG_CMD_DATE | \
CFG_CMD_ELF)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
/*#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,9600" */ /*#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,9600" */
@ -98,7 +93,7 @@
/*#define CONFIG_BOOTFILE "elinos-lart" */ /*#define CONFIG_BOOTFILE "elinos-lart" */
/*#define CONFIG_BOOTCOMMAND "tftp; bootm" */ /*#define CONFIG_BOOTCOMMAND "tftp; bootm" */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
/* what's this ? it's not used anywhere */ /* what's this ? it's not used anywhere */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */

@ -42,11 +42,6 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define BOOTFLAG_WARM 0x02 /* Software reboot */
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/* /*
* Serial console configuration * Serial console configuration
*/ */
@ -72,26 +67,25 @@
#define CFG_CMD_POST_DIAG 0 #define CFG_CMD_POST_DIAG 0
#endif #endif
/* /*
* Supported commands * Command line configuration.
*/ */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #include <config_cmd_default.h>
CFG_CMD_ASKENV | \ #define CONFIG_CMD_ASKENV
CFG_CMD_DATE | \ #define CONFIG_CMD_DATE
CFG_CMD_DHCP | \ #define CONFIG_CMD_DHCP
CFG_CMD_ECHO | \ #define CONFIG_CMD_ECHO
CFG_CMD_EEPROM | \ #define CONFIG_CMD_EEPROM
CFG_CMD_I2C | \ #define CONFIG_CMD_I2C
CFG_CMD_JFFS2 | \ #define CONFIG_CMD_JFFS2
CFG_CMD_MII | \ #define CONFIG_CMD_MII
CFG_CMD_NFS | \ #define CONFIG_CMD_NFS
CFG_CMD_PING | \ #define CONFIG_CMD_PING
CFG_CMD_POST_DIAG | \ #define CONFIG_CMD_POST
CFG_CMD_REGINFO | \ #define CONFIG_CMD_REGINFO
CFG_CMD_SNTP ) #define CONFIG_CMD_SNTP
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */
@ -319,7 +313,7 @@
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -338,6 +332,11 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/* /*
* Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined, * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
* which is normally part of the default commands (CFV_CMD_DFL) * which is normally part of the default commands (CFV_CMD_DFL)

@ -39,12 +39,6 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define BOOTFLAG_WARM 0x02 /* Software reboot */
#define CFG_CACHELINE_SIZE 32 /* For MPC8220 CPUs */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/* /*
* Serial console configuration * Serial console configuration
*/ */
@ -69,30 +63,26 @@
#define CONFIG_PCI_CFG_PHYS CONFIG_PCI_CFG_BUS #define CONFIG_PCI_CFG_PHYS CONFIG_PCI_CFG_BUS
#define CONFIG_PCI_CFG_SIZE 0x01000000 #define CONFIG_PCI_CFG_SIZE 0x01000000
/* /*
* Supported commands * Command line configuration.
*/ */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #include <config_cmd_default.h>
CFG_CMD_BOOTD | \
CFG_CMD_CACHE | \ #define CONFIG_CMD_BOOTD
CFG_CMD_DHCP | \ #define CONFIG_CMD_CACHE
CFG_CMD_DIAG | \ #define CONFIG_CMD_DHCP
CFG_CMD_ELF | \ #define CONFIG_CMD_DIAG
CFG_CMD_I2C | \ #define CONFIG_CMD_ELF
CFG_CMD_NET | \ #define CONFIG_CMD_I2C
CFG_CMD_NFS | \ #define CONFIG_CMD_NET
CFG_CMD_PCI | \ #define CONFIG_CMD_NFS
CFG_CMD_PING | \ #define CONFIG_CMD_PCI
CFG_CMD_REGINFO | \ #define CONFIG_CMD_PING
CFG_CMD_SDRAM | \ #define CONFIG_CMD_REGINFO
CFG_CMD_SNTP | \ #define CONFIG_CMD_SDRAM
0) #define CONFIG_CMD_SNTP
/* CFG_CMD_MII | \ */
/* CFG_CMD_USB | \ */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* /*
* Default Environment * Default Environment
@ -268,7 +258,7 @@
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -284,6 +274,11 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
#define CFG_CACHELINE_SIZE 32 /* For MPC8220 CPUs */
#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/* /*
* Various low-level settings * Various low-level settings
*/ */

@ -80,24 +80,24 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
#define CONFIG_BZIP2 /* include support for bzip2 compressed images */ #define CONFIG_BZIP2 /* include support for bzip2 compressed images */
#ifndef CONFIG_COMMANDS
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_ASKENV \
| CFG_CMD_DATE \
| CFG_CMD_ECHO \
| CFG_CMD_IMMAP \
| CFG_CMD_JFFS2 \
| CFG_CMD_PING \
| CFG_CMD_DHCP \
| CFG_CMD_I2C \
| CFG_CMD_MII)
/* & ~( CFG_CMD_NET)) */
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_DATE
#define CONFIG_CMD_ECHO
#define CONFIG_CMD_IMMAP
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#endif /* !CONFIG_COMMANDS */ #undef CONFIG_CMD_NET
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
@ -107,7 +107,7 @@
#define CFG_HUSH_PARSER #define CFG_HUSH_PARSER
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -202,7 +202,7 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* I2C configuration * I2C configuration
*/ */
#if (CONFIG_COMMANDS & CFG_CMD_I2C) #if defined(CONFIG_CMD_I2C)
/* enable I2C and select the hardware/software driver */ /* enable I2C and select the hardware/software driver */
#undef CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_HARD_I2C /* I2C with hardware support */
#define CONFIG_SOFT_I2C 1 /* I2C bit-banged */ #define CONFIG_SOFT_I2C 1 /* I2C bit-banged */

@ -44,11 +44,6 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define BOOTFLAG_WARM 0x02 /* Software reboot */
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/* /*
* Serial console configuration * Serial console configuration
*/ */
@ -88,12 +83,6 @@
#define CONFIG_NS8382X 1 #define CONFIG_NS8382X 1
#endif /* CONFIG_STK52XX */ #endif /* CONFIG_STK52XX */
#ifdef CONFIG_PCI
#define ADD_PCI_CMD CFG_CMD_PCI
#else
#define ADD_PCI_CMD 0
#endif
/* /*
* Video console * Video console
*/ */
@ -110,12 +99,6 @@
#define CFG_CONSOLE_IS_IN_ENV #define CFG_CONSOLE_IS_IN_ENV
#endif #endif
#ifdef CONFIG_VIDEO
#define ADD_BMP_CMD CFG_CMD_BMP
#else
#define ADD_BMP_CMD 0
#endif
/* Partitions */ /* Partitions */
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
@ -124,10 +107,7 @@
/* USB */ /* USB */
#ifdef CONFIG_STK52XX #ifdef CONFIG_STK52XX
#define CONFIG_USB_OHCI #define CONFIG_USB_OHCI
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#else
#define ADD_USB_CMD 0
#endif #endif
/* POST support */ /* POST support */
@ -143,36 +123,44 @@
#define CFG_CMD_POST_DIAG 0 #define CFG_CMD_POST_DIAG 0
#endif #endif
/* IDE */
#if defined (CONFIG_MINIFAP) || defined (CONFIG_STK52XX)
#define ADD_IDE_CMD (CFG_CMD_IDE | CFG_CMD_FAT | CFG_CMD_EXT2)
#else
#define ADD_IDE_CMD 0
#endif
/* /*
* Supported commands * Command line configuration.
*/ */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #include <config_cmd_default.h>
ADD_BMP_CMD | \
ADD_IDE_CMD | \ #if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX)
ADD_PCI_CMD | \ #define CONFIG_CMD_IDE
ADD_USB_CMD | \ #define CONFIG_CMD_FAT
CFG_CMD_ASKENV | \ #define CONFIG_CMD_EXT2
CFG_CMD_DATE | \ #endif
CFG_CMD_DHCP | \
CFG_CMD_ECHO | \ #ifdef CONFIG_STK52XX
CFG_CMD_EEPROM | \ #define CONFIG_CMD_USB
CFG_CMD_I2C | \ #define CONFIG_CMD_FAT
CFG_CMD_MII | \ #endif
CFG_CMD_NFS | \
CFG_CMD_PING | \ #ifdef CONFIG_VIDEO
CFG_CMD_POST_DIAG | \ #define CONFIG_CMD_BMP
CFG_CMD_REGINFO | \ #endif
CFG_CMD_SNTP )
#ifdef CONFIG_PCI
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #define CONFIG_CMD_PCI
#include <cmd_confdefs.h> #endif
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ECHO
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_POST
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SNTP
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */
@ -406,7 +394,7 @@
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -425,6 +413,11 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/* /*
* Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined, * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
* which is normally part of the default commands (CFV_CMD_DFL) * which is normally part of the default commands (CFV_CMD_DFL)

@ -55,10 +55,12 @@
#define MICROBLAZE_SYSREG_BASE_ADDR 0xFFFFA000 #define MICROBLAZE_SYSREG_BASE_ADDR 0xFFFFA000
#define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0) #define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0)
#define CONFIG_COMMANDS (CONFIG__CMD_DFL)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /*
#include <cmd_confdefs.h> * Command line configuration.
*/
#include <config_cmd_default.h>
#define CFG_UART1_BASE (0xFFFF2000) #define CFG_UART1_BASE (0xFFFF2000)
#define CONFIG_SERIAL_BASE CFG_UART1_BASE #define CONFIG_SERIAL_BASE CFG_UART1_BASE

@ -132,15 +132,18 @@
#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ /*
CFG_CMD_DHCP | \ * Command line configuration.
CFG_CMD_DOC | \ */
/* CFG_CMD_IDE |*/ \ #include <config_cmd_default.h>
CFG_CMD_DATE )
#define CONFIG_CMD_ASKENV
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #define CONFIG_CMD_DHCP
#include <cmd_confdefs.h> #define CONFIG_CMD_DOC
#define CONFIG_CMD_DATE
#define CFG_NAND_LEGACY #define CFG_NAND_LEGACY
/* /*
@ -153,7 +156,7 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -246,7 +249,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

Loading…
Cancel
Save