micro: move more config stuff into common.h
This commit is contained in:
parent
b1860e6426
commit
b8232ca19c
|
@ -69,52 +69,6 @@
|
|||
#include <configs/ar7240_freq.h>
|
||||
|
||||
|
||||
/*
|
||||
* timeout values are in ticks
|
||||
*/
|
||||
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
|
||||
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
|
||||
|
||||
/*
|
||||
* Cache lock for stack
|
||||
*/
|
||||
#define CFG_INIT_SP_OFFSET 0x1000
|
||||
|
||||
#ifndef COMPRESSED_UBOOT
|
||||
#define CFG_ENV_IS_IN_FLASH 1
|
||||
#undef CFG_ENV_IS_NOWHERE
|
||||
#else
|
||||
#undef CFG_ENV_IS_IN_FLASH
|
||||
#define CFG_ENV_IS_NOWHERE 1
|
||||
#endif /* #ifndef COMPRESSED_UBOOT */
|
||||
|
||||
/* Address and size of Primary Environment Sector */
|
||||
#define CFG_ENV_ADDR 0x9f040000
|
||||
#define CFG_ENV_SIZE 0x10000
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "bootm 0x9f050000"
|
||||
|
||||
#define CONFIG_NET_MULTI
|
||||
|
||||
#define CONFIG_MEMSIZE_IN_BYTES
|
||||
|
||||
#ifdef COMPRESSED_UBOOT
|
||||
#define ATH_NO_PCI_INIT
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
*/
|
||||
#ifndef COMPRESSED_UBOOT
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI | \
|
||||
CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \
|
||||
CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT ))
|
||||
#elif defined(VXWORKS_UBOOT)
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF))
|
||||
#else
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII))
|
||||
#endif /* #ifndef COMPRESSED_UBOOT */
|
||||
|
||||
#define CFG_ATHRS26_PHY 1
|
||||
|
||||
#define CONFIG_IPADDR 192.168.2.100
|
||||
|
|
|
@ -1,6 +1,49 @@
|
|||
|
||||
/* commands */
|
||||
/*
|
||||
* timeout values are in ticks
|
||||
*/
|
||||
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
|
||||
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
|
||||
|
||||
/*
|
||||
* Cache lock for stack
|
||||
*/
|
||||
#define CFG_INIT_SP_OFFSET 0x1000
|
||||
|
||||
#ifndef COMPRESSED_UBOOT
|
||||
#define CFG_ENV_IS_IN_FLASH 1
|
||||
#undef CFG_ENV_IS_NOWHERE
|
||||
#else
|
||||
#undef CFG_ENV_IS_IN_FLASH
|
||||
#define CFG_ENV_IS_NOWHERE 1
|
||||
#endif /* #ifndef COMPRESSED_UBOOT */
|
||||
|
||||
/* Address and size of Primary Environment Sector */
|
||||
#define CFG_ENV_ADDR 0x9f040000
|
||||
#define CFG_ENV_SIZE 0x10000
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "bootm 0x9f050000"
|
||||
|
||||
#define CONFIG_NET_MULTI
|
||||
|
||||
#define CONFIG_MEMSIZE_IN_BYTES
|
||||
|
||||
#ifdef COMPRESSED_UBOOT
|
||||
#define ATH_NO_PCI_INIT
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
*/
|
||||
#ifndef COMPRESSED_UBOOT
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI | \
|
||||
CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \
|
||||
CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT ))
|
||||
#elif defined(VXWORKS_UBOOT)
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF))
|
||||
#else
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII))
|
||||
#endif /* #ifndef COMPRESSED_UBOOT */
|
||||
|
||||
|
||||
/* platform specific */
|
||||
|
|
|
@ -67,52 +67,6 @@
|
|||
|
||||
#include <configs/ar7240_freq.h>
|
||||
|
||||
/*
|
||||
* timeout values are in ticks
|
||||
*/
|
||||
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
|
||||
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
|
||||
|
||||
/*
|
||||
* Cache lock for stack
|
||||
*/
|
||||
#define CFG_INIT_SP_OFFSET 0x1000
|
||||
|
||||
#ifndef COMPRESSED_UBOOT
|
||||
#define CFG_ENV_IS_IN_FLASH 1
|
||||
#undef CFG_ENV_IS_NOWHERE
|
||||
#else
|
||||
#undef CFG_ENV_IS_IN_FLASH
|
||||
#define CFG_ENV_IS_NOWHERE 1
|
||||
#endif /* #ifndef COMPRESSED_UBOOT */
|
||||
|
||||
/* Address and size of Primary Environment Sector */
|
||||
#define CFG_ENV_ADDR 0x9f040000
|
||||
#define CFG_ENV_SIZE 0x10000
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "bootm 0x9f050000"
|
||||
|
||||
#define CONFIG_NET_MULTI
|
||||
|
||||
#define CONFIG_MEMSIZE_IN_BYTES
|
||||
|
||||
#ifdef COMPRESSED_UBOOT
|
||||
#define ATH_NO_PCI_INIT
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
*/
|
||||
#ifndef COMPRESSED_UBOOT
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI | \
|
||||
CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \
|
||||
CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT ))
|
||||
#elif defined(VXWORKS_UBOOT)
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF))
|
||||
#else
|
||||
#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII))
|
||||
#endif /* #ifndef COMPRESSED_UBOOT */
|
||||
|
||||
#define CFG_ATHRS26_PHY 1
|
||||
|
||||
#define CONFIG_IPADDR 192.168.2.100
|
||||
|
|
Loading…
Reference in New Issue