Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ee0270dff748213bd009fad566c913110fbd89f9

Authored by Joakim Tjernlund
Committed by Wolfgang Denk
1 parent 337f5f50f5
Exists in master and in 54 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, 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, v2017.01-smarct4x

PowerPC, nand_spl: Add relocation support for -fpic 

By rearranging the linker script we get support for
relocation of -fpic for free.
Move __got2_entries outside _GOT2_TABLE_ defining scope
matching the rest of PowerPC

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Acked-by: Scott Wood <scottwood@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>

Showing 3 changed files with 9 additions and 3 deletions Side-by-side Diff

nand_spl/board/freescale/mpc8313erdb/u-boot.lds
Diff comments   View file @ ee0270d
... ... @@ -39,8 +39,10 @@
39 39 *(.sdata*)
40 40 _GOT2_TABLE_ = .;
41 41 KEEP(*(.got2))
42   - __got2_entries = (. - _GOT2_TABLE_) >> 2;
  42 + KEEP(*(.got))
  43 + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
43 44 }
  45 + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
44 46  
45 47 . = ALIGN(8);
46 48 __bss_start = .;
nand_spl/board/freescale/mpc8315erdb/u-boot.lds
Diff comments   View file @ ee0270d
... ... @@ -39,8 +39,10 @@
39 39 *(.sdata*)
40 40 _GOT2_TABLE_ = .;
41 41 KEEP(*(.got2))
42   - __got2_entries = (. - _GOT2_TABLE_) >> 2;
  42 + KEEP(*(.got))
  43 + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
43 44 }
  45 + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
44 46  
45 47 . = ALIGN(8);
46 48 __bss_start = .;
nand_spl/board/sheldon/simpc8313/u-boot.lds
Diff comments   View file @ ee0270d
... ... @@ -40,8 +40,10 @@
40 40 *(.sdata*)
41 41 _GOT2_TABLE_ = .;
42 42 *(.got2)
43   - __got2_entries = (. - _GOT2_TABLE_) >> 2;
  43 + KEEP(*(.got))
  44 + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
44 45 }
  46 + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
45 47  
46 48 . = ALIGN(8);
47 49 __bss_start = .;