Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit fe0c33a5acc8cc5400747200802089177bd94b58

Authored by Bin Meng
Committed by Simon Glass
1 parent c7016234f7
Exists in v2017.01-smarct4x and in 37 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, 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

x86: Clean up asm-offsets 

Move GD_BIST from lib/asm-offsets.c to arch/x86/lib/asm-offsets.c
as it is x86 arch specific stuff. Also remove GENERATED_GD_RELOC_OFF
which is not referenced anymore.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

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

arch/x86/cpu/start.S
Diff comments   View file @ fe0c33a
1 1 /*
2   - * U-boot - x86 Startup Code
  2 + * U-Boot - x86 Startup Code
3 3 *
4 4 * (C) Copyright 2008-2011
5 5 * Graeme Russ, <graeme.russ@gmail.com>
... ... @@ -17,6 +17,7 @@
17 17 #include <asm/processor.h>
18 18 #include <asm/processor-flags.h>
19 19 #include <generated/generic-asm-offsets.h>
  20 +#include <generated/asm-offsets.h>
20 21  
21 22 .section .text
22 23 .code32
arch/x86/lib/asm-offsets.c
Diff comments   View file @ fe0c33a
... ... @@ -17,7 +17,7 @@
17 17  
18 18 int main(void)
19 19 {
20   - DEFINE(GENERATED_GD_RELOC_OFF, offsetof(gd_t, reloc_off));
  20 + DEFINE(GD_BIST, offsetof(gd_t, arch.bist));
21 21 return 0;
22 22 }
... ... @@ -31,9 +31,6 @@
31 31 #ifdef CONFIG_SYS_MALLOC_F_LEN
32 32 DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base));
33 33 #endif
34   -#ifdef CONFIG_X86
35   - DEFINE(GD_BIST, offsetof(struct global_data, arch.bist));
36   -#endif
37 34  
38 35 #if defined(CONFIG_ARM)
39 36