micro: move more config stuff into common.h

This commit is contained in:
Alexander Couzens 2015-03-04 19:59:01 +01:00
parent 2f28c555cf
commit ed5b09c07a
3 changed files with 14 additions and 32 deletions

View File

@ -27,6 +27,9 @@
#define CFG_FLASH_SECTOR_SIZE (64*1024)
#define CFG_FLASH_SIZE 0x01000000
#define WLANCAL 0x9fff1000
#define BOARDCAL 0x9fff0000
#if (CFG_MAX_FLASH_SECT * CFG_FLASH_SECTOR_SIZE) != CFG_FLASH_SIZE
# error "Invalid flash configuration"
#endif
@ -70,22 +73,6 @@
#include <configs/common.h>
/*
** Parameters defining the location of the calibration/initialization
** information for the two Merlin devices.
** NOTE: **This will change with different flash configurations**
*/
#define WLANCAL 0x9fff1000
#define BOARDCAL 0x9fff0000
#define ATHEROS_PRODUCT_ID 138
#define CAL_SECTOR (CFG_MAX_FLASH_SECT - 1)
/* For Kite, only PCI-e interface is valid */
#define AR7240_ART_PCICFG_OFFSET 3
#include <cmd_confdefs.h>
#endif /* __CONFIG_H */

View File

@ -94,3 +94,11 @@
#define CFG_BAUDRATE_TABLE { 300, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, \
115200, 128000, 230400, 250000, 256000, 460800, 500000, 576000, 921600, \
1000000, 1152000, 1500000, 2000000, 3000000}
/* calibration */
#define ATHEROS_PRODUCT_ID 138
#define CAL_SECTOR (CFG_MAX_FLASH_SECT - 1)
/* For Kite, only PCI-e interface is valid */
#define AR7240_ART_PCICFG_OFFSET 3

View File

@ -27,6 +27,9 @@
#define CFG_FLASH_SECTOR_SIZE (64*1024)
#define CFG_FLASH_SIZE 0x00800000
#define WLANCAL 0x9fff1000
#define BOARDCAL 0x9fff0000
#if (CFG_MAX_FLASH_SECT * CFG_FLASH_SECTOR_SIZE) != CFG_FLASH_SIZE
# error "Invalid flash configuration"
#endif
@ -68,22 +71,6 @@
#include <configs/common.h>
/*
** Parameters defining the location of the calibration/initialization
** information for the two Merlin devices.
** NOTE: **This will change with different flash configurations**
*/
#define WLANCAL 0x9fff1000
#define BOARDCAL 0x9fff0000
#define ATHEROS_PRODUCT_ID 138
#define CAL_SECTOR (CFG_MAX_FLASH_SECT - 1)
/* For Kite, only PCI-e interface is valid */
#define AR7240_ART_PCICFG_OFFSET 3
#include <cmd_confdefs.h>
#endif /* __CONFIG_H */