Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0938b6094ee0389e3231db667d0263cac8bff258

Authored by Prabhakar Kushwaha
Committed by York Sun
1 parent 18c0144542
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

powerpc/mpc85xx:Avoid fix address of bootpg section 

It is not necessary for bootpg to be present at text + 512KB.
With increase of u-boot size (768KB), bootpg section's address
cannot be fixed.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

Showing 2 changed files with 12 additions and 2 deletions Side-by-side Diff

arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
Diff comments   View file @ 0938b60
... ... @@ -4,6 +4,12 @@
4 4 * SPDX-License-Identifier: GPL-2.0+
5 5 */
6 6  
  7 +#include "config.h" /* CONFIG_BOARDDIR */
  8 +
  9 +#ifndef CONFIG_SYS_MONITOR_LEN
  10 +#define CONFIG_SYS_MONITOR_LEN 0x80000
  11 +#endif
  12 +
7 13 OUTPUT_ARCH(powerpc)
8 14 /* Do we need any of these for elf?
9 15 __DYNAMIC = 0; */
... ... @@ -76,7 +82,7 @@
76 82 KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
77 83 } :text = 0xffff
78 84  
79   - . = ADDR(.text) + 0x80000;
  85 + . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN;
80 86  
81 87 __bss_start = .;
82 88 .bss (NOLOAD) :
arch/powerpc/cpu/mpc85xx/u-boot.lds
Diff comments   View file @ 0938b60
... ... @@ -12,6 +12,10 @@
12 12 #define RESET_VECTOR_ADDRESS 0xfffffffc
13 13 #endif
14 14  
  15 +#ifndef CONFIG_SYS_MONITOR_LEN
  16 +#define CONFIG_SYS_MONITOR_LEN 0x80000
  17 +#endif
  18 +
15 19 OUTPUT_ARCH(powerpc)
16 20 ENTRY(_start_e500)
17 21  
... ... @@ -85,7 +89,7 @@
85 89 {
86 90 KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
87 91 } :text = 0xffff
88   - . = ADDR(.text) + 0x80000;
  92 + . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN;
89 93 #else
90 94 .bootpg RESET_VECTOR_ADDRESS - 0xffc :
91 95 {