micro: move more config stuff into common.h

This commit is contained in:
Alexander Couzens 2015-03-04 19:53:19 +01:00
parent 9ab171012d
commit b1860e6426
3 changed files with 27 additions and 39 deletions

View File

@ -142,32 +142,14 @@
#define CFG_C2_IMG_LOAD_ADDR "0x80F00000"
#define CFG_C2_IMG_FILENAME "carambola2.bin"
#define ARCH_DMA_MINALIGN 4*1024 // 4kb in datasheet
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_MAXARGS 16
#define HAVE_BLOCK_DEVICE
#define CONFIG_PARTITIONS
#define CONFIG_DOS_PARTITION
#define CONFIG_FS_FAT
#define CONFIG_SUPPORT_VFAT
#define CONFIG_SYS_LOAD_ADDR 0x82000000
#define CONFIG_NEEDS_MANUAL_RELOC
#include <configs/common.h>
#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_AUTOBOOT_PROMPT "Hit '%s' key(s) to stop autoboot: %2d "
#define CONFIG_AUTOBOOT_STOP_STR "\x1B"
#undef CFG_BAUDRATE_TABLE
#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}
/*
** 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

View File

@ -0,0 +1,25 @@
/* commands */
/* platform specific */
#define ARCH_DMA_MINALIGN 4*1024 // 4kb in datasheet
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_MAXARGS 16
#define HAVE_BLOCK_DEVICE
#define CONFIG_PARTITIONS
#define CONFIG_DOS_PARTITION
#define CONFIG_FS_FAT
#define CONFIG_SUPPORT_VFAT
#define CONFIG_SYS_LOAD_ADDR 0x82000000
#define CONFIG_NEEDS_MANUAL_RELOC
#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_AUTOBOOT_PROMPT "Hit '%s' key(s) to stop autoboot: %2d "
#define CONFIG_AUTOBOOT_STOP_STR "\x1B"
#undef CFG_BAUDRATE_TABLE
#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}

View File

@ -140,33 +140,14 @@
#define CFG_C2_IMG_LOAD_ADDR "0x80F00000"
#define CFG_C2_IMG_FILENAME "carambola2.bin"
#define ARCH_DMA_MINALIGN 4*1024 // 4kb in datasheet
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_MAXARGS 16
#define HAVE_BLOCK_DEVICE
#define CONFIG_PARTITIONS
#define CONFIG_DOS_PARTITION
#define CONFIG_FS_FAT
#define CONFIG_SUPPORT_VFAT
#define CONFIG_SYS_LOAD_ADDR 0x82000000
#define CONFIG_NEEDS_MANUAL_RELOC
#include <configs/common.h>
#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_AUTOBOOT_PROMPT "Hit '%s' key(s) to stop autoboot: %2d "
#define CONFIG_AUTOBOOT_STOP_STR "\x1B"
#undef CFG_BAUDRATE_TABLE
#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}
/*
** 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