mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-26 06:30:39 +00:00
include/configs: Use new CONFIG_CMD_* in various m* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger
Wolfgang Denk
parent
9bbb1c0820
commit
5dc11a5119
9 changed files with 167 additions and 189 deletions
|
|
@ -40,11 +40,6 @@
|
|||
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
|
||||
#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
|
||||
*
|
||||
|
|
@ -92,22 +87,21 @@
|
|||
|
||||
/* USB */
|
||||
#define CONFIG_USB_OHCI
|
||||
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
|
||||
#define CONFIG_USB_STORAGE
|
||||
/* automatic software updates (see board/mcc200/auto_update.c) */
|
||||
#define CONFIG_AUTO_UPDATE 1
|
||||
|
||||
/*
|
||||
* Supported commands
|
||||
*/
|
||||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
|
||||
ADD_USB_CMD | \
|
||||
CFG_CMD_BEDBUG | \
|
||||
CFG_CMD_FAT | \
|
||||
CFG_CMD_I2C)
|
||||
|
||||
/* 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_BEDBUG
|
||||
#define CONFIG_CMD_FAT
|
||||
#define CONFIG_CMD_I2C
|
||||
#define CONFIG_CMD_USB
|
||||
|
||||
|
||||
/*
|
||||
* Autobooting
|
||||
|
|
@ -291,7 +285,7 @@
|
|||
*/
|
||||
#define CFG_LONGHELP /* undef to save memory */
|
||||
#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 */
|
||||
#else
|
||||
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
|
||||
|
|
@ -307,6 +301,11 @@
|
|||
|
||||
#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
|
||||
|
||||
/*
|
||||
* Various low-level settings
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -87,13 +87,19 @@
|
|||
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
|
||||
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
|
||||
|
||||
#define REMOVE_COMMANDS (CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_FAT | \
|
||||
CFG_CMD_IMLS )
|
||||
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_NET) \
|
||||
& ~REMOVE_COMMANDS)
|
||||
|
||||
/* 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_NET
|
||||
|
||||
#undef CONFIG_CMD_FLASH
|
||||
#undef CONFIG_CMD_LOADS
|
||||
#undef CONFIG_CMD_FAT
|
||||
#undef CONFIG_CMD_IMLS
|
||||
|
||||
|
||||
/* #define CONFIG_SYS_CLK_FREQ XPAR_CORE_CLOCK_FREQ_HZ */
|
||||
/* 300000000 */
|
||||
|
|
|
|||
|
|
@ -145,82 +145,45 @@
|
|||
#define CFG_FLASH_PROTECTION /* hardware flash protection */
|
||||
#endif /* !FLASH */
|
||||
|
||||
#ifdef FLASH
|
||||
#ifdef RAMENV
|
||||
#define CONFIG_COMMANDS (CONFIG__CMD_DFL |\
|
||||
CFG_CMD_MEMORY |\
|
||||
CFG_CMD_MISC |\
|
||||
CFG_CMD_AUTOSCRIPT |\
|
||||
CFG_CMD_IRQ |\
|
||||
CFG_CMD_ASKENV |\
|
||||
CFG_CMD_BDI |\
|
||||
CFG_CMD_RUN |\
|
||||
CFG_CMD_LOADS |\
|
||||
CFG_CMD_LOADB |\
|
||||
CFG_CMD_IMI |\
|
||||
CFG_CMD_NET |\
|
||||
CFG_CMD_CACHE |\
|
||||
CFG_CMD_FAT |\
|
||||
CFG_CMD_EXT2 |\
|
||||
CFG_CMD_JFFS2 |\
|
||||
CFG_CMD_ECHO |\
|
||||
CFG_CMD_IMLS |\
|
||||
CFG_CMD_FLASH |\
|
||||
CFG_CMD_MFSL |\
|
||||
CFG_CMD_PING \
|
||||
)
|
||||
#else /* !RAMENV */
|
||||
#define CONFIG_COMMANDS (CONFIG__CMD_DFL |\
|
||||
CFG_CMD_MEMORY |\
|
||||
CFG_CMD_MISC |\
|
||||
CFG_CMD_AUTOSCRIPT |\
|
||||
CFG_CMD_IRQ |\
|
||||
CFG_CMD_ASKENV |\
|
||||
CFG_CMD_BDI |\
|
||||
CFG_CMD_RUN |\
|
||||
CFG_CMD_LOADS |\
|
||||
CFG_CMD_LOADB |\
|
||||
CFG_CMD_IMI |\
|
||||
CFG_CMD_NET |\
|
||||
CFG_CMD_CACHE |\
|
||||
CFG_CMD_IMLS |\
|
||||
CFG_CMD_FLASH |\
|
||||
CFG_CMD_PING |\
|
||||
CFG_CMD_ENV |\
|
||||
CFG_CMD_FAT |\
|
||||
CFG_CMD_EXT2 |\
|
||||
CFG_CMD_JFFS2 |\
|
||||
CFG_CMD_ECHO |\
|
||||
CFG_CMD_MFSL |\
|
||||
CFG_CMD_SAVES \
|
||||
)
|
||||
|
||||
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
#include <config_cmd_default.h>
|
||||
|
||||
#define CONFIG_CMD_ASKENV
|
||||
#define CONFIG_CMD_AUTOSCRIPT
|
||||
#define CONFIG_CMD_BDI
|
||||
#define CONFIG_CMD_CACHE
|
||||
#define CONFIG_CMD_EXT2
|
||||
#define CONFIG_CMD_FAT
|
||||
#define CONFIG_CMD_IMI
|
||||
#define CONFIG_CMD_IRQ
|
||||
#define CONFIG_CMD_LOADB
|
||||
#define CONFIG_CMD_LOADS
|
||||
#define CONFIG_CMD_MEMORY
|
||||
#define CONFIG_CMD_MISC
|
||||
#define CONFIG_CMD_MFSL
|
||||
#define CONFIG_CMD_NET
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_RUN
|
||||
|
||||
#if defined(FLASH)
|
||||
#define CONFIG_CMD_ECHO
|
||||
#define CONFIG_CMD_FLASH
|
||||
#define CONFIG_CMD_IMLS
|
||||
#define CONFIG_CMD_JFFS2
|
||||
|
||||
#if !defined(RAMENV)
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_SAVES
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#else /* !FLASH */
|
||||
#define CONFIG_COMMANDS (CONFIG__CMD_DFL |\
|
||||
CFG_CMD_MEMORY |\
|
||||
CFG_CMD_MISC |\
|
||||
CFG_CMD_AUTOSCRIPT |\
|
||||
CFG_CMD_IRQ |\
|
||||
CFG_CMD_ASKENV |\
|
||||
CFG_CMD_BDI |\
|
||||
CFG_CMD_RUN |\
|
||||
CFG_CMD_LOADS |\
|
||||
CFG_CMD_FAT |\
|
||||
CFG_CMD_EXT2 |\
|
||||
CFG_CMD_LOADB |\
|
||||
CFG_CMD_IMI |\
|
||||
CFG_CMD_NET |\
|
||||
CFG_CMD_CACHE |\
|
||||
CFG_CMD_MFSL |\
|
||||
CFG_CMD_PING \
|
||||
)
|
||||
#endif /* !FLASH */
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
|
||||
|
||||
#if defined(CONFIG_CMD_JFFS2)
|
||||
/* JFFS2 partitions */
|
||||
#define CONFIG_JFFS2_CMDLINE /* mtdparts command line support */
|
||||
#define MTDIDS_DEFAULT "nor0=ml401-0"
|
||||
|
|
|
|||
|
|
@ -65,10 +65,14 @@
|
|||
|
||||
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
|
||||
|
||||
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_JFFS2))
|
||||
|
||||
/* 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_JFFS2
|
||||
|
||||
|
||||
#define CONFIG_NETMASK 255.255.255.0
|
||||
#define CONFIG_IPADDR 192.168.30.2
|
||||
|
|
@ -81,7 +85,7 @@
|
|||
#define CONFIG_BOOTCOMMAND "bootm 0x10020000 0x100a0000"
|
||||
#define CONFIG_BOOTARGS "console=ttyS0,38400 initrd=0x100a0040,530K root=/dev/ram keepinitrd"
|
||||
|
||||
#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_SER_INDEX 2 /* which serial port to use */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -37,28 +37,26 @@
|
|||
|
||||
|
||||
/*
|
||||
* Supported commands
|
||||
* Command line configuration.
|
||||
*/
|
||||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
|
||||
CFG_CMD_ASKENV | \
|
||||
CFG_CMD_DHCP | \
|
||||
CFG_CMD_REGINFO | \
|
||||
CFG_CMD_IMMAP | \
|
||||
CFG_CMD_ELF | \
|
||||
CFG_CMD_MII | \
|
||||
CFG_CMD_BEDBUG | \
|
||||
CFG_CMD_NET | \
|
||||
CFG_CMD_PING | \
|
||||
CFG_CMD_IDE | \
|
||||
CFG_CMD_FAT | \
|
||||
CFG_CMD_JFFS2 | \
|
||||
CFG_CMD_I2C | \
|
||||
CFG_CMD_DATE | \
|
||||
CFG_CMD_EEPROM | \
|
||||
CFG_CMD_DTT)
|
||||
#include <config_cmd_default.h>
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
#define CONFIG_CMD_ASKENV
|
||||
#define CONFIG_CMD_DHCP
|
||||
#define CONFIG_CMD_REGINFO
|
||||
#define CONFIG_CMD_IMMAP
|
||||
#define CONFIG_CMD_ELF
|
||||
#define CONFIG_CMD_MII
|
||||
#define CONFIG_CMD_BEDBUG
|
||||
#define CONFIG_CMD_NET
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_IDE
|
||||
#define CONFIG_CMD_FAT
|
||||
#define CONFIG_CMD_JFFS2
|
||||
#define CONFIG_CMD_I2C
|
||||
#define CONFIG_CMD_DATE
|
||||
#define CONFIG_CMD_EEPROM
|
||||
#define CONFIG_CMD_DTT
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -123,36 +123,44 @@
|
|||
|
||||
#define CONFIG_BOOTDELAY 3
|
||||
|
||||
#ifdef CONFIG_HARD_I2C
|
||||
#define CONFIG_COMMANDS \
|
||||
((CONFIG_CMD_DFL | \
|
||||
CFG_CMD_DATE | \
|
||||
CFG_CMD_DHCP | \
|
||||
CFG_CMD_EEPROM | \
|
||||
CFG_CMD_I2C | \
|
||||
CFG_CMD_NFS | \
|
||||
CFG_CMD_SNTP | \
|
||||
CFG_CMD_MISC))
|
||||
#else
|
||||
#define CONFIG_COMMANDS \
|
||||
((CONFIG_CMD_DFL | \
|
||||
CFG_CMD_DHCP | \
|
||||
CFG_CMD_NFS | \
|
||||
CFG_CMD_SNTP | \
|
||||
CFG_CMD_USB | \
|
||||
CFG_CMD_CACHE) & \
|
||||
~(CFG_CMD_BDI | \
|
||||
CFG_CMD_IMI | \
|
||||
CFG_CMD_AUTOSCRIPT | \
|
||||
CFG_CMD_FPGA | \
|
||||
CFG_CMD_MISC | \
|
||||
CFG_CMD_LOADS ))
|
||||
|
||||
#if !defined(CONFIG_HARD_I2C)
|
||||
#define CONFIG_TIMESTAMP
|
||||
#endif
|
||||
#define CFG_LONGHELP
|
||||
|
||||
/* 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_DHCP
|
||||
#define CONFIG_CMD_NFS
|
||||
#define CONFIG_CMD_SNTP
|
||||
|
||||
#if defined(CONFIG_HARD_I2C)
|
||||
|
||||
#define CONFIG_CMD_DATE
|
||||
#define CONFIG_CMD_EEPROM
|
||||
#define CONFIG_CMD_I2C
|
||||
#define CONFIG_CMD_MISC
|
||||
|
||||
#else
|
||||
|
||||
#define CONFIG_CMD_USB
|
||||
#define CONFIG_CMD_CACHE
|
||||
|
||||
#undef CONFIG_CMD_AUTOSCRIPT
|
||||
#undef CONFIG_CMD_BDI
|
||||
#undef CONFIG_CMD_FPGA
|
||||
#undef CONFIG_CMD_IMI
|
||||
#undef CONFIG_CMD_LOADS
|
||||
#undef CONFIG_CMD_MISC
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#define CFG_LONGHELP
|
||||
|
||||
#define CONFIG_NR_DRAM_BANKS 1
|
||||
#define PHYS_SDRAM 0x20000000
|
||||
|
|
|
|||
|
|
@ -149,22 +149,25 @@
|
|||
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \
|
||||
CONFIG_BOOTP_BOOTFILESIZE)
|
||||
|
||||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
|
||||
| CFG_CMD_ASKENV \
|
||||
| CFG_CMD_CACHE \
|
||||
| CFG_CMD_PCI \
|
||||
| CFG_CMD_I2C \
|
||||
| CFG_CMD_SDRAM \
|
||||
| CFG_CMD_EEPROM \
|
||||
| CFG_CMD_FLASH \
|
||||
| CFG_CMD_ENV \
|
||||
| CFG_CMD_BSP \
|
||||
| CFG_CMD_DHCP \
|
||||
| CFG_CMD_PING \
|
||||
| CFG_CMD_DATE)
|
||||
|
||||
/* 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_ASKENV
|
||||
#define CONFIG_CMD_CACHE
|
||||
#define CONFIG_CMD_PCI
|
||||
#define CONFIG_CMD_I2C
|
||||
#define CONFIG_CMD_SDRAM
|
||||
#define CONFIG_CMD_EEPROM
|
||||
#define CONFIG_CMD_FLASH
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_BSP
|
||||
#define CONFIG_CMD_DHCP
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_DATE
|
||||
|
||||
|
||||
/*set date in u-boot*/
|
||||
#define CONFIG_RTC_M48T35A
|
||||
|
|
@ -182,7 +185,7 @@
|
|||
#define CFG_LONGHELP /* undef to save memory */
|
||||
#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 CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port at */
|
||||
#else
|
||||
|
|
@ -387,7 +390,7 @@
|
|||
* Cache Configuration
|
||||
*/
|
||||
#define CFG_CACHELINE_SIZE 32 /* For all MPC74xx CPUs */
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
|
||||
#if defined(CONFIG_CMD_KGDB)
|
||||
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -78,25 +78,23 @@
|
|||
|
||||
#define CONFIG_BAUDRATE 115200
|
||||
|
||||
/***********************************************************
|
||||
* Command definition
|
||||
***********************************************************/
|
||||
|
||||
#define CONFIG_COMMANDS \
|
||||
(CONFIG_CMD_DFL | \
|
||||
CFG_CMD_CACHE | \
|
||||
CFG_CMD_REGINFO | \
|
||||
CFG_CMD_ELF)
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
#include <config_cmd_default.h>
|
||||
|
||||
#define CONFIG_CMD_CACHE
|
||||
#define CONFIG_CMD_REGINFO
|
||||
#define CONFIG_CMD_ELF
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
||||
#define CONFIG_BOOTDELAY 3
|
||||
#define CONFIG_BOOTARGS "root=/dev/msdk mem=48M"
|
||||
#define CONFIG_BOOTFILE "mx1ads"
|
||||
#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 */
|
||||
/* what's this ? it's not used anywhere */
|
||||
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */
|
||||
|
|
|
|||
|
|
@ -34,22 +34,21 @@
|
|||
#undef _CONFIG_UART4 /* internal uart 4 */
|
||||
#undef CONFIG_SILENT_CONSOLE /* use this to disable output */
|
||||
|
||||
/*
|
||||
* Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
|
||||
* neccessary in include/cmd_confdefs.h file. (Un)comment for getting
|
||||
* functionality or size of u-boot code.
|
||||
*/
|
||||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
|
||||
& ~CFG_CMD_LOADS \
|
||||
& ~CFG_CMD_CONSOLE \
|
||||
& ~CFG_CMD_AUTOSCRIPT \
|
||||
& ~CFG_CMD_NET \
|
||||
& ~CFG_CMD_PING \
|
||||
& ~CFG_CMD_DHCP \
|
||||
| CFG_CMD_JFFS2 \
|
||||
)
|
||||
|
||||
#include <cmd_confdefs.h>
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
#include <config_cmd_default.h>
|
||||
|
||||
#define CONFIG_CMD_JFFS2
|
||||
|
||||
#undef CONFIG_CMD_LOADS
|
||||
#undef CONFIG_CMD_CONSOLE
|
||||
#undef CONFIG_CMD_AUTOSCRIPT
|
||||
#undef CONFIG_CMD_NET
|
||||
#undef CONFIG_CMD_PING
|
||||
#undef CONFIG_CMD_DHCP
|
||||
|
||||
|
||||
/*
|
||||
* Boot options. Setting delay to -1 stops autostart count down.
|
||||
|
|
|
|||
Loading…
Reference in a new issue