mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-30 00:21:06 +00:00
Merge git://git.denx.de/u-boot-mpc85xx
This commit is contained in:
commit
335f7b1290
24 changed files with 31 additions and 29 deletions
|
@ -79,7 +79,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
||||||
/* *I*G - eSDHC/eSPI/NAND boot */
|
/* *I*G - eSDHC/eSPI/NAND boot */
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX | MAS3_SW | MAS3_SR, 0,
|
MAS3_SX | MAS3_SW | MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
|
|
||||||
#endif /* RAMBOOT/SPL */
|
#endif /* RAMBOOT/SPL */
|
||||||
|
|
|
@ -147,7 +147,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 17, BOOKE_PAGESZ_2G, 1)
|
0, 17, BOOKE_PAGESZ_2G, 1)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -49,7 +49,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)
|
#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)
|
#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -67,11 +67,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD))
|
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD))
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE,
|
CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_256M, 1),
|
0, 8, BOOKE_PAGESZ_256M, 1),
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 9, BOOKE_PAGESZ_256M, 1),
|
0, 9, BOOKE_PAGESZ_256M, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
* 0xf000_0000 64M LBC SDRAM
|
* 0xf000_0000 64M LBC SDRAM
|
||||||
*/
|
*/
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 6, BOOKE_PAGESZ_64M, 1),
|
0, 6, BOOKE_PAGESZ_64M, 1),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -48,7 +48,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
*/
|
*/
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE,
|
||||||
CONFIG_SYS_LBC_SDRAM_BASE_PHYS,
|
CONFIG_SYS_LBC_SDRAM_BASE_PHYS,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 2, BOOKE_PAGESZ_64M, 1),
|
0, 2, BOOKE_PAGESZ_64M, 1),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -67,7 +67,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
* 0xf000_0000 64M LBC SDRAM
|
* 0xf000_0000 64M LBC SDRAM
|
||||||
*/
|
*/
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 4, BOOKE_PAGESZ_64M, 1),
|
0, 4, BOOKE_PAGESZ_64M, 1),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -76,7 +76,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
#if defined(CONFIG_SYS_RAMBOOT) || \
|
#if defined(CONFIG_SYS_RAMBOOT) || \
|
||||||
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -75,12 +75,12 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
||||||
/* **** - eSDHC/eSPI/NAND boot */
|
/* **** - eSDHC/eSPI/NAND boot */
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
/* **** - eSDHC/eSPI/NAND boot - second 1GB of memory */
|
/* **** - eSDHC/eSPI/NAND boot - second 1GB of memory */
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 9, BOOKE_PAGESZ_1G, 1),
|
0, 9, BOOKE_PAGESZ_1G, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -86,12 +86,12 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
#ifdef CONFIG_SYS_RAMBOOT
|
#ifdef CONFIG_SYS_RAMBOOT
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE,
|
CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 12, BOOKE_PAGESZ_256M, 1),
|
0, 12, BOOKE_PAGESZ_256M, 1),
|
||||||
|
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 13, BOOKE_PAGESZ_256M, 1),
|
0, 13, BOOKE_PAGESZ_256M, 1),
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -82,7 +82,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
|
||||||
/* *I*G - eSDHC/eSPI/NAND boot */
|
/* *I*G - eSDHC/eSPI/NAND boot */
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
|
|
||||||
#if defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_TARGET_P1020RDB_PD)
|
#if defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_TARGET_P1020RDB_PD)
|
||||||
|
|
|
@ -67,7 +67,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
#ifdef CONFIG_SYS_RAMBOOT
|
#ifdef CONFIG_SYS_RAMBOOT
|
||||||
/* *I*G - eSDHC boot */
|
/* *I*G - eSDHC boot */
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 8, BOOKE_PAGESZ_1G, 1),
|
0, 8, BOOKE_PAGESZ_1G, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -102,11 +102,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 12, BOOKE_PAGESZ_1G, 1),
|
0, 12, BOOKE_PAGESZ_1G, 1),
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 13, BOOKE_PAGESZ_1G, 1)
|
0, 13, BOOKE_PAGESZ_1G, 1)
|
||||||
#endif
|
#endif
|
||||||
/* entry 14 and 15 has been used hard coded, they will be disabled
|
/* entry 14 and 15 has been used hard coded, they will be disabled
|
||||||
|
|
|
@ -102,11 +102,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 12, BOOKE_PAGESZ_1G, 1),
|
0, 12, BOOKE_PAGESZ_1G, 1),
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 13, BOOKE_PAGESZ_1G, 1)
|
0, 13, BOOKE_PAGESZ_1G, 1)
|
||||||
#endif
|
#endif
|
||||||
/* entry 14 and 15 has been used hard coded, they will be disabled
|
/* entry 14 and 15 has been used hard coded, they will be disabled
|
||||||
|
|
|
@ -120,11 +120,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 12, BOOKE_PAGESZ_1G, 1),
|
0, 12, BOOKE_PAGESZ_1G, 1),
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 13, BOOKE_PAGESZ_1G, 1)
|
0, 13, BOOKE_PAGESZ_1G, 1)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -145,7 +145,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 19, BOOKE_PAGESZ_2G, 1)
|
0, 19, BOOKE_PAGESZ_2G, 1)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -144,7 +144,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 19, BOOKE_PAGESZ_2G, 1)
|
0, 19, BOOKE_PAGESZ_2G, 1)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 19, BOOKE_PAGESZ_2G, 1)
|
0, 19, BOOKE_PAGESZ_2G, 1)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -116,7 +116,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD)
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 18, BOOKE_PAGESZ_2G, 1)
|
0, 18, BOOKE_PAGESZ_2G, 1)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -65,7 +65,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_RAMBOOT
|
#ifdef CONFIG_SYS_RAMBOOT
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 6, BOOKE_PAGESZ_1G, 1),
|
0, 6, BOOKE_PAGESZ_1G, 1),
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -66,7 +66,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
* 0xf0000000 64M LBC SDRAM First half
|
* 0xf0000000 64M LBC SDRAM First half
|
||||||
*/
|
*/
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
|
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 3, BOOKE_PAGESZ_64M, 1),
|
0, 3, BOOKE_PAGESZ_64M, 1),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -75,7 +75,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
||||||
*/
|
*/
|
||||||
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE + 0x4000000,
|
SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE + 0x4000000,
|
||||||
CONFIG_SYS_LBC_SDRAM_BASE + 0x4000000,
|
CONFIG_SYS_LBC_SDRAM_BASE + 0x4000000,
|
||||||
MAS3_SX|MAS3_SW|MAS3_SR, 0,
|
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
|
||||||
0, 4, BOOKE_PAGESZ_64M, 1),
|
0, 4, BOOKE_PAGESZ_64M, 1),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -634,6 +634,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
|
||||||
#ifdef CONFIG_USB_EHCI_HCD
|
#ifdef CONFIG_USB_EHCI_HCD
|
||||||
#define CONFIG_USB_EHCI_FSL
|
#define CONFIG_USB_EHCI_FSL
|
||||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||||
|
#define CONFIG_EHCI_DESC_BIG_ENDIAN
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -782,6 +782,7 @@
|
||||||
#ifdef CONFIG_USB_EHCI_HCD
|
#ifdef CONFIG_USB_EHCI_HCD
|
||||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||||
#define CONFIG_USB_EHCI_FSL
|
#define CONFIG_USB_EHCI_FSL
|
||||||
|
#define CONFIG_EHCI_DESC_BIG_ENDIAN
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue