summaryrefslogtreecommitdiff
path: root/board/freescale
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-11-01 16:18:43 +0100
committerWolfgang Denk <wd@denx.de>2008-11-01 16:18:43 +0100
commit3ec53148eb68ddfb0c3311fb4c06cd2bd0ef3eeb (patch)
tree2f780547f462895413e6e26dd6e331824bed35f0 /board/freescale
parentb24ef56587a2a9295de55e526a365e6af3ab2581 (diff)
parenta47f957ab523019992fdef857af01bd71c58a4da (diff)
downloadu-boot-imx-3ec53148eb68ddfb0c3311fb4c06cd2bd0ef3eeb.zip
u-boot-imx-3ec53148eb68ddfb0c3311fb4c06cd2bd0ef3eeb.tar.gz
u-boot-imx-3ec53148eb68ddfb0c3311fb4c06cd2bd0ef3eeb.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board/freescale')
-rw-r--r--board/freescale/mpc8536ds/law.c1
-rw-r--r--board/freescale/mpc8536ds/tlb.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/board/freescale/mpc8536ds/law.c b/board/freescale/mpc8536ds/law.c
index 8013d41..0861fa7 100644
--- a/board/freescale/mpc8536ds/law.c
+++ b/board/freescale/mpc8536ds/law.c
@@ -38,6 +38,7 @@ struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_PCIE3_MEM_PHYS, LAWAR_SIZE_512M, LAW_TRGT_IF_PCIE_3),
SET_LAW(CONFIG_SYS_PCIE3_IO_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_PCIE_3),
SET_LAW(PIXIS_BASE, LAW_SIZE_4K, LAW_TRGT_IF_LBC),
+ SET_LAW(CONFIG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
};
int num_law_entries = ARRAY_SIZE(law_table);
diff --git a/board/freescale/mpc8536ds/tlb.c b/board/freescale/mpc8536ds/tlb.c
index ebf41ce..c81a959 100644
--- a/board/freescale/mpc8536ds/tlb.c
+++ b/board/freescale/mpc8536ds/tlb.c
@@ -66,6 +66,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
SET_TLB_ENTRY(1, CONFIG_SYS_PCI1_IO_PHYS, CONFIG_SYS_PCI1_IO_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 3, BOOKE_PAGESZ_256K, 1),
+
+ /* *I*G - NAND */
+ SET_TLB_ENTRY(1, CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_BASE_PHYS,
+ MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+ 0, 4, BOOKE_PAGESZ_1M, 1),
};
int num_tlb_entries = ARRAY_SIZE(tlb_table);