diff options
| author | wdenk <wdenk> | 2003-07-14 22:13:32 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-07-14 22:13:32 +0000 |
| commit | 8564acf936726c5568d71e4fa93a0ae9814e0d07 (patch) | |
| tree | 05fa981555adf1d333970f3d52d0683008fe3cfb /include/configs | |
| parent | 5702923e23238df6c6f62d53f73863462ae62f4e (diff) | |
| download | u-boot-imx-8564acf936726c5568d71e4fa93a0ae9814e0d07.zip u-boot-imx-8564acf936726c5568d71e4fa93a0ae9814e0d07.tar.gz u-boot-imx-8564acf936726c5568d71e4fa93a0ae9814e0d07.tar.bz2 | |
* Patches by Yuli Barcohen, 13 Jul 2003:
- Correct flash and JFFS2 support for MPC8260ADS
- fix PVR values and clock generation for PowerQUICC II family
(8270/8275/8280)
* Patch by Bernhard Kuhn, 08 Jul 2003:
- add support for M68K targets
* Patch by Ken Chou, 3 Jul:
- Fix PCI config table for A3000
- Fix iobase for natsemi.c
(PCI_BASE_ADDRESS_0 is the IO base register for DP83815)
* Allow to enable "slow" POST routines by key press on power-on
* Fix temperature dependend switching of LCD backlight on LWMON
* Tweak output format for LWMON
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/A3000.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8260ADS.h | 8 | ||||
| -rw-r--r-- | include/configs/RRvision.h | 7 | ||||
| -rw-r--r-- | include/configs/lwmon.h | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/include/configs/A3000.h b/include/configs/A3000.h index b25e48c..ca9592c 100644 --- a/include/configs/A3000.h +++ b/include/configs/A3000.h @@ -114,6 +114,8 @@ #define PCI_ENET1_MEMADDR 0x81000000 #define PCI_ENET2_IOADDR 0x82000000 #define PCI_ENET2_MEMADDR 0x82000000 +#define PCI_ENET3_IOADDR 0x83000000 +#define PCI_ENET3_MEMADDR 0x83000000 /*----------------------------------------------------------------------- diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index c41e542..401591d 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -206,6 +206,14 @@ #define CFG_FLASH_SIZE 8 #define CFG_FLASH_ERASE_TOUT 8000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 5 /* Timeout for Flash Write (in ms) */ +#define CFG_FLASH_LOCK_TOUT 5 /* Timeout for Flash Set Lock Bit (in ms) */ +#define CFG_FLASH_UNLOCK_TOUT 10000 /* Timeout for Flash Clear Lock Bits (in ms) */ +#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ + +#define CFG_JFFS2_FIRST_SECTOR 1 +#define CFG_JFFS2_LAST_SECTOR 27 +#define CFG_JFFS2_SORT_FRAGMENTS +#define CFG_JFFS_CUSTOM_PART /* this is stuff came out of the Motorola docs */ #define CFG_DEFAULT_IMMR 0x0F010000 diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 926d63a..7f2c8a4 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -100,13 +100,13 @@ #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ -#if 1 +#ifndef CONFIG_LCD #define CONFIG_VIDEO 1 /* To enable the video initialization */ /* Video related */ #define CONFIG_VIDEO_LOGO 1 /* Show the logo */ -#define CONFIG_VIDEO_ENCODER_AD7176 1 /* Enable this encoder */ -#define CONFIG_VIDEO_ENCODER_AD7176_ADDR 0x2A /* ALSB to ground */ +#define CONFIG_VIDEO_ENCODER_AD7179 1 /* Enable this encoder */ +#define CONFIG_VIDEO_ENCODER_AD7179_ADDR 0x2A /* ALSB to ground */ #endif /* enable I2C and select the hardware/software driver */ @@ -344,6 +344,7 @@ *----------------------------------------------------------------------- * */ +/*#define CFG_DER 0x2002000F*/ #define CFG_DER 0 /* diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 5de846c..d427d80 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -579,6 +579,6 @@ #define CONFIG_MODEM_SUPPORT 1 /* enable modem initialization stuff */ #undef CONFIG_MODEM_SUPPORT_DEBUG -#define CONFIG_MODEM_KEY_MAGIC "3C+3F" /* hold down these keys to enable modem */ - +#define CONFIG_MODEM_KEY_MAGIC "3C+3F" /* press F3 + F6 keys to enable modem */ +#define CONFIG_POST_KEY_MAGIC "3C+3E" /* press F3 + F5 keys to force POST */ #endif /* __CONFIG_H */ |