diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-02-03 20:05:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-02-03 20:05:27 +0100 |
| commit | 5c1a1a3069c194ac6509344e58f8c96779d2d197 (patch) | |
| tree | 2948216df92e75bcee9dfdb8d308e6a9a83cbd00 /board | |
| parent | 0ae016f1ff6b06e94db52373efd08d106bfcecdf (diff) | |
| parent | b081c2e9b9329d7dadc8d13fc9a2bae5c90a1204 (diff) | |
| download | u-boot-imx-5c1a1a3069c194ac6509344e58f8c96779d2d197.zip u-boot-imx-5c1a1a3069c194ac6509344e58f8c96779d2d197.tar.gz u-boot-imx-5c1a1a3069c194ac6509344e58f8c96779d2d197.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/mpc8569mds/config.mk | 9 | ||||
| -rw-r--r-- | board/freescale/mpc8569mds/tlb.c | 11 |
2 files changed, 20 insertions, 0 deletions
diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk index 962f79b..7de0f7c 100644 --- a/board/freescale/mpc8569mds/config.mk +++ b/board/freescale/mpc8569mds/config.mk @@ -23,4 +23,13 @@ # # mpc8569mds board # +ifndef NAND_SPL +ifeq ($(CONFIG_MK_NAND), y) +TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +LDSCRIPT := $(TOPDIR)/cpu/$(CPU)/u-boot-nand.lds +endif +endif + +ifndef TEXT_BASE TEXT_BASE = 0xfff80000 +endif diff --git a/board/freescale/mpc8569mds/tlb.c b/board/freescale/mpc8569mds/tlb.c index 3b8ee05..73dcc3e 100644 --- a/board/freescale/mpc8569mds/tlb.c +++ b/board/freescale/mpc8569mds/tlb.c @@ -90,6 +90,17 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 4, BOOKE_PAGESZ_64M, 1), + +#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L2_ADDR) + /* *I*G - L2SRAM */ + SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR, CONFIG_SYS_INIT_L2_ADDR_PHYS, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 5, BOOKE_PAGESZ_256K, 1), + SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR + 0x40000, + CONFIG_SYS_INIT_L2_ADDR_PHYS + 0x40000, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 6, BOOKE_PAGESZ_256K, 1), +#endif }; int num_tlb_entries = ARRAY_SIZE(tlb_table); |