diff options
Diffstat (limited to 'board/freescale/mpc8548cds/tlb.c')
| -rw-r--r-- | board/freescale/mpc8548cds/tlb.c | 24 | 
1 files changed, 12 insertions, 12 deletions
| diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c index ab99af7e1..eab212a4c 100644 --- a/board/freescale/mpc8548cds/tlb.c +++ b/board/freescale/mpc8548cds/tlb.c @@ -28,16 +28,16 @@  struct fsl_e_tlb_entry tlb_table[] = {  	/* TLB 0 - for temp stack in cache */ -	SET_TLB_ENTRY(0, CFG_INIT_RAM_ADDR, CFG_INIT_RAM_ADDR, +	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 0, BOOKE_PAGESZ_4K, 0), -	SET_TLB_ENTRY(0, CFG_INIT_RAM_ADDR + 4 * 1024 , CFG_INIT_RAM_ADDR + 4 * 1024, +	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 0, BOOKE_PAGESZ_4K, 0), -	SET_TLB_ENTRY(0, CFG_INIT_RAM_ADDR + 8 * 1024 , CFG_INIT_RAM_ADDR + 8 * 1024, +	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 0, BOOKE_PAGESZ_4K, 0), -	SET_TLB_ENTRY(0, CFG_INIT_RAM_ADDR + 12 * 1024 , CFG_INIT_RAM_ADDR + 12 * 1024, +	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 0, BOOKE_PAGESZ_4K, 0), @@ -46,7 +46,7 @@ struct fsl_e_tlb_entry tlb_table[] = {  	 * 0xff000000	16M	FLASH  	 * Out of reset this entry is only 4K.  	 */ -	SET_TLB_ENTRY(1, CFG_BOOT_BLOCK, CFG_BOOT_BLOCK, +	SET_TLB_ENTRY(1, CONFIG_SYS_BOOT_BLOCK, CONFIG_SYS_BOOT_BLOCK,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 0, BOOKE_PAGESZ_16M, 1), @@ -54,22 +54,22 @@ struct fsl_e_tlb_entry tlb_table[] = {  	 * TLB 1:	1G	Non-cacheable, guarded  	 * 0x80000000	1G	PCI1/PCIE  8,9,a,b  	 */ -	SET_TLB_ENTRY(1, CFG_PCI_PHYS, CFG_PCI_PHYS, +	SET_TLB_ENTRY(1, CONFIG_SYS_PCI_PHYS, CONFIG_SYS_PCI_PHYS,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 1, BOOKE_PAGESZ_1G, 1), -#ifdef CFG_RIO_MEM_PHYS +#ifdef CONFIG_SYS_RIO_MEM_PHYS  	/*  	 * TLB 2:	256M	Non-cacheable, guarded  	 */ -	SET_TLB_ENTRY(1, CFG_RIO_MEM_BASE, CFG_RIO_MEM_BASE, +	SET_TLB_ENTRY(1, CONFIG_SYS_RIO_MEM_BASE, CONFIG_SYS_RIO_MEM_BASE,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 2, BOOKE_PAGESZ_256M, 1),  	/*  	 * TLB 3:	256M	Non-cacheable, guarded  	 */ -	SET_TLB_ENTRY(1, CFG_RIO_MEM_BASE + 0x10000000, CFG_RIO_MEM_BASE + 0x10000000, +	SET_TLB_ENTRY(1, CONFIG_SYS_RIO_MEM_BASE + 0x10000000, CONFIG_SYS_RIO_MEM_BASE + 0x10000000,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 3, BOOKE_PAGESZ_256M, 1),  #endif @@ -80,7 +80,7 @@ struct fsl_e_tlb_entry tlb_table[] = {  	 * 0xe210_0000	1M	PCI2 IO  	 * 0xe300_0000	1M	PCIe IO  	 */ -	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, 5, BOOKE_PAGESZ_64M, 1), @@ -88,7 +88,7 @@ struct fsl_e_tlb_entry tlb_table[] = {  	 * TLB 6:	64M	Cacheable, non-guarded  	 * 0xf000_0000	64M	LBC SDRAM  	 */ -	SET_TLB_ENTRY(1, CFG_LBC_CACHE_BASE, CFG_LBC_CACHE_BASE, +	SET_TLB_ENTRY(1, CONFIG_SYS_LBC_CACHE_BASE, CONFIG_SYS_LBC_CACHE_BASE,  		      MAS3_SX|MAS3_SW|MAS3_SR, 0,  		      0, 6, BOOKE_PAGESZ_64M, 1), @@ -96,7 +96,7 @@ struct fsl_e_tlb_entry tlb_table[] = {  	 * TLB 7:	64M	Non-cacheable, guarded  	 * 0xf8000000	64M	CADMUS registers, relocated L2SRAM  	 */ -	SET_TLB_ENTRY(1, CFG_LBC_NONCACHE_BASE, CFG_LBC_NONCACHE_BASE, +	SET_TLB_ENTRY(1, CONFIG_SYS_LBC_NONCACHE_BASE, CONFIG_SYS_LBC_NONCACHE_BASE,  		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,  		      0, 7, BOOKE_PAGESZ_64M, 1),  }; |