diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 4 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 | ||||
-rw-r--r-- | arch/powerpc/dts/kmcent2-u-boot.dtsi | 4 | ||||
-rw-r--r-- | arch/powerpc/dts/u-boot.dtsi | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 1bba216371b..8d629d3b960 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -30,7 +30,7 @@ void setup_ifc(void) _mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(15); _mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_TS | MAS1_IPROT | MAS1_TSIZE(BOOKE_PAGESZ_4M); - _mas2 = FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, MAS2_I|MAS2_G); + _mas2 = FSL_BOOKE_MAS2(CONFIG_TEXT_BASE, MAS2_I | MAS2_G); _mas3 = FSL_BOOKE_MAS3(flash_phys, 0, MAS3_SW|MAS3_SR|MAS3_SX); _mas7 = FSL_BOOKE_MAS7(flash_phys); @@ -58,7 +58,7 @@ void setup_ifc(void) MAS0_ESEL(CONFIG_SYS_PPC_E500_DEBUG_TLB); _mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_IPROT | MAS1_TSIZE(BOOKE_PAGESZ_4M); - _mas2 = FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, MAS2_I|MAS2_G); + _mas2 = FSL_BOOKE_MAS2(CONFIG_TEXT_BASE, MAS2_I | MAS2_G); _mas3 = FSL_BOOKE_MAS3(flash_phys, 0, MAS3_SW|MAS3_SR|MAS3_SX); _mas7 = FSL_BOOKE_MAS7(flash_phys); diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index c766f20cb03..fa3aa954cbb 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -18,7 +18,7 @@ SECTIONS { /* Optional boot sector */ #if defined(CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR) && !defined(CONFIG_SPL) - .bootsect CONFIG_SYS_TEXT_BASE - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512 : { + .bootsect CONFIG_TEXT_BASE - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512 : { KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootsect)) . = CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512; } diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi index eeaa688b657..28f303b749e 100644 --- a/arch/powerpc/dts/kmcent2-u-boot.dtsi +++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi @@ -77,13 +77,13 @@ binman { filename = "u-boot.bin"; - skip-at-start = <CONFIG_SYS_TEXT_BASE>; + skip-at-start = <CONFIG_TEXT_BASE>; sort-by-offset; pad-byte = <0xff>; size = <CONFIG_SYS_MONITOR_LEN>; u-boot-with-ucode-ptr { - offset = <CONFIG_SYS_TEXT_BASE>; + offset = <CONFIG_TEXT_BASE>; optional-ucode; }; diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi index 6588bb7fa5e..b4b5257362e 100644 --- a/arch/powerpc/dts/u-boot.dtsi +++ b/arch/powerpc/dts/u-boot.dtsi @@ -10,13 +10,13 @@ / { binman { filename = "u-boot.bin"; - skip-at-start = <CONFIG_SYS_TEXT_BASE>; + skip-at-start = <CONFIG_TEXT_BASE>; sort-by-offset; pad-byte = <0xff>; size = <CONFIG_SYS_MONITOR_LEN>; u-boot-with-ucode-ptr { - offset = <CONFIG_SYS_TEXT_BASE>; + offset = <CONFIG_TEXT_BASE>; optional-ucode; }; |