mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-22 15:11:33 +00:00
Fix TQM834x hang.
This commit is contained in:
parent
0a0f3a46fb
commit
6fe16a8769
2 changed files with 16 additions and 5 deletions
|
@ -2,6 +2,8 @@
|
||||||
Changes since U-Boot 1.1.4:
|
Changes since U-Boot 1.1.4:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
* Fix TQM834x hang.
|
||||||
|
|
||||||
* Cleanup debug code for yucca board.
|
* Cleanup debug code for yucca board.
|
||||||
|
|
||||||
* MCC200: restrict addressable flash space to 32 MB
|
* MCC200: restrict addressable flash space to 32 MB
|
||||||
|
|
|
@ -422,9 +422,9 @@ extern int tqm834x_num_flash_banks;
|
||||||
#define CFG_SICRL SICRL_LDP_A
|
#define CFG_SICRL SICRL_LDP_A
|
||||||
|
|
||||||
/* i-cache and d-cache disabled */
|
/* i-cache and d-cache disabled */
|
||||||
#define CFG_HID0_INIT 0x000000000
|
#define CFG_HID0_INIT 0x000000000
|
||||||
#define CFG_HID0_FINAL CFG_HID0_INIT
|
#define CFG_HID0_FINAL CFG_HID0_INIT
|
||||||
#define CFG_HID2 0x000000000
|
#define CFG_HID2 HID2_HBE
|
||||||
|
|
||||||
/* DDR 0 - 512M */
|
/* DDR 0 - 512M */
|
||||||
#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
|
#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
|
||||||
|
@ -437,12 +437,21 @@ extern int tqm834x_num_flash_banks;
|
||||||
#define CFG_IBAT2U (CFG_INIT_RAM_ADDR | BATU_BL_128K | BATU_VS | BATU_VP)
|
#define CFG_IBAT2U (CFG_INIT_RAM_ADDR | BATU_BL_128K | BATU_VS | BATU_VP)
|
||||||
|
|
||||||
/* PCI */
|
/* PCI */
|
||||||
#define CFG_IBAT3L (CFG_PCI1_MEM_BASE | BATL_PP_10 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
|
#ifdef CONFIG_PCI
|
||||||
|
#define CFG_IBAT3L (CFG_PCI1_MEM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
|
||||||
#define CFG_IBAT3U (CFG_PCI1_MEM_BASE | BATU_BL_256M | BATU_VS | BATU_VP)
|
#define CFG_IBAT3U (CFG_PCI1_MEM_BASE | BATU_BL_256M | BATU_VS | BATU_VP)
|
||||||
#define CFG_IBAT4L (CFG_PCI1_MEM_BASE + 0x10000000 | BATL_PP_10 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
|
#define CFG_IBAT4L (CFG_PCI1_MEM_BASE + 0x10000000 | BATL_PP_10 | BATL_MEMCOHERENCE)
|
||||||
#define CFG_IBAT4U (CFG_PCI1_MEM_BASE + 0x10000000 | BATU_BL_256M | BATU_VS | BATU_VP)
|
#define CFG_IBAT4U (CFG_PCI1_MEM_BASE + 0x10000000 | BATU_BL_256M | BATU_VS | BATU_VP)
|
||||||
#define CFG_IBAT5L (CFG_PCI1_IO_BASE | BATL_PP_10 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
|
#define CFG_IBAT5L (CFG_PCI1_IO_BASE | BATL_PP_10 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
|
||||||
#define CFG_IBAT5U (CFG_PCI1_IO_BASE + 0x10000000 | BATU_BL_16M | BATU_VS | BATU_VP)
|
#define CFG_IBAT5U (CFG_PCI1_IO_BASE + 0x10000000 | BATU_BL_16M | BATU_VS | BATU_VP)
|
||||||
|
#else
|
||||||
|
#define CFG_IBAT3L (0)
|
||||||
|
#define CFG_IBAT3U (0)
|
||||||
|
#define CFG_IBAT4L (0)
|
||||||
|
#define CFG_IBAT4U (0)
|
||||||
|
#define CFG_IBAT5L (0)
|
||||||
|
#define CFG_IBAT5U (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* IMMRBAR */
|
/* IMMRBAR */
|
||||||
#define CFG_IBAT6L (CFG_IMMRBAR | BATL_PP_10 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
|
#define CFG_IBAT6L (CFG_IMMRBAR | BATL_PP_10 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
|
||||||
|
|
Loading…
Add table
Reference in a new issue