micro: move more config stuff into common.h

This commit is contained in:
Alexander Couzens 2015-03-04 19:55:51 +01:00
parent b8232ca19c
commit 2f28c555cf
3 changed files with 28 additions and 56 deletions

View File

@ -31,34 +31,6 @@
# error "Invalid flash configuration"
#endif
#define CFG_FLASH_WORD_SIZE unsigned short
/*
* We boot from this flash
*/
#define CFG_FLASH_BASE 0x9f000000
#ifdef COMPRESSED_UBOOT
#define BOOTSTRAP_TEXT_BASE CFG_FLASH_BASE
#define BOOTSTRAP_CFG_MONITOR_BASE BOOTSTRAP_TEXT_BASE
#endif
/*
* The following #defines are needed to get flash environment right
*/
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MONITOR_LEN (192 << 10)
#undef CONFIG_BOOTARGS
/* XXX - putting rootfs in last partition results in jffs errors */
/* default mtd partition table */
#undef MTDPARTS_DEFAULT
#define CONFIG_BOOTARGS ""
#define MTDPARTS_DEFAULT ""
/* pll and ddr configuration */
#define CONFIG_40MHZ_XTAL_SUPPORT 1
#define NEW_DDR_TAP_CAL 1

View File

@ -1,4 +1,32 @@
#define CFG_FLASH_WORD_SIZE unsigned short
/*
* We boot from this flash
*/
#define CFG_FLASH_BASE 0x9f000000
#ifdef COMPRESSED_UBOOT
#define BOOTSTRAP_TEXT_BASE CFG_FLASH_BASE
#define BOOTSTRAP_CFG_MONITOR_BASE BOOTSTRAP_TEXT_BASE
#endif
/*
* The following #defines are needed to get flash environment right
*/
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MONITOR_LEN (192 << 10)
#undef CONFIG_BOOTARGS
/* XXX - putting rootfs in last partition results in jffs errors */
/* default mtd partition table */
#undef MTDPARTS_DEFAULT
#define CONFIG_BOOTARGS ""
#define MTDPARTS_DEFAULT ""
/*
* timeout values are in ticks
*/

View File

@ -31,34 +31,6 @@
# error "Invalid flash configuration"
#endif
#define CFG_FLASH_WORD_SIZE unsigned short
/*
* We boot from this flash
*/
#define CFG_FLASH_BASE 0x9f000000
#ifdef COMPRESSED_UBOOT
#define BOOTSTRAP_TEXT_BASE CFG_FLASH_BASE
#define BOOTSTRAP_CFG_MONITOR_BASE BOOTSTRAP_TEXT_BASE
#endif
/*
* The following #defines are needed to get flash environment right
*/
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MONITOR_LEN (192 << 10)
#undef CONFIG_BOOTARGS
/* XXX - putting rootfs in last partition results in jffs errors */
/* default mtd partition table */
#undef MTDPARTS_DEFAULT
#define CONFIG_BOOTARGS ""
#define MTDPARTS_DEFAULT ""
/* pll and ddr configuration */
#define NEW_DDR_TAP_CAL 1