diff options
Diffstat (limited to 'board/mpc8540eval/tlb.c')
| -rw-r--r-- | board/mpc8540eval/tlb.c | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/board/mpc8540eval/tlb.c b/board/mpc8540eval/tlb.c index 1003bf613..06092f89b 100644 --- a/board/mpc8540eval/tlb.c +++ b/board/mpc8540eval/tlb.c @@ -27,34 +27,34 @@  #include <asm/mmu.h>  struct fsl_e_tlb_entry tlb_table[] = { -	SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS, +	SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 1, BOOKE_PAGESZ_1M, 1), -  #if defined(CFG_FLASH_PORT_WIDTH_16) -	SET_TLB_ENTRY(1, CFG_FLASH_BASE, CFG_FLASH_BASE, +  #if defined(CONFIG_SYS_FLASH_PORT_WIDTH_16) +	SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 2, BOOKE_PAGESZ_4M, 1), -	SET_TLB_ENTRY(1, CFG_FLASH_BASE + 0x400000, CFG_FLASH_BASE + 0x400000, +	SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE + 0x400000, CONFIG_SYS_FLASH_BASE + 0x400000,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 3, BOOKE_PAGESZ_4M, 1),    #else -	SET_TLB_ENTRY(1, CFG_FLASH_BASE, CFG_FLASH_BASE, +	SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 2, BOOKE_PAGESZ_16M, 1),    #endif    #if !defined(CONFIG_SPD_EEPROM) -	SET_TLB_ENTRY(1, CFG_DDR_SDRAM_BASE, CFG_DDR_SDRAM_BASE, +	SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 4, BOOKE_PAGESZ_64M, 1), -	SET_TLB_ENTRY(1, CFG_DDR_SDRAM_BASE + 0x4000000, CFG_DDR_SDRAM_BASE + 0x4000000, +	SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x4000000, CONFIG_SYS_DDR_SDRAM_BASE + 0x4000000,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 5, BOOKE_PAGESZ_64M, 1),    #endif -	SET_TLB_ENTRY(1, CFG_LBC_SDRAM_BASE, CFG_LBC_SDRAM_BASE, +	SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,    #if defined(CONFIG_RAM_AS_FLASH)  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,    #else @@ -62,15 +62,15 @@ struct fsl_e_tlb_entry tlb_table[] = {    #endif  		      0, 6, BOOKE_PAGESZ_64M, 1), -	SET_TLB_ENTRY(1, CFG_INIT_RAM_ADDR, CFG_INIT_RAM_ADDR, +	SET_TLB_ENTRY(1, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 7, BOOKE_PAGESZ_16K, 1), -	SET_TLB_ENTRY(1, CFG_PCI_MEM_PHYS, CFG_PCI_MEM_PHYS, +	SET_TLB_ENTRY(1, CONFIG_SYS_PCI_MEM_PHYS, CONFIG_SYS_PCI_MEM_PHYS,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 8, BOOKE_PAGESZ_256M, 1), -	SET_TLB_ENTRY(1, CFG_BCSR, CFG_BCSR, +	SET_TLB_ENTRY(1, CONFIG_SYS_BCSR, CONFIG_SYS_BCSR,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 9, BOOKE_PAGESZ_16K, 1),  }; |