Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ac6a6bd64a8bbbdcd5885bc5f47589d8b72e7935

Authored by Simon Glass
Committed by Tom Rini
1 parent 6862b50f6e
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

arm: Make u-boot-arm.h a private header 

Rather than including this arch-specific header file in common.h, include
it from within arm's u-boot.h header.

Also drop the comment about something to be fixed. It has been there
forever and it is not clear what it means.

Signed-off-by: Simon Glass <sjg@chromium.org>

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

arch/arm/include/asm/u-boot-arm.h
Diff comments   View file @ ac6a6bd
... ... @@ -13,6 +13,8 @@
13 13 #ifndef _U_BOOT_ARM_H_
14 14 #define _U_BOOT_ARM_H_ 1
15 15  
  16 +#ifndef __ASSEMBLY__
  17 +
16 18 /* for the following variables, see start.S */
17 19 extern ulong IRQ_STACK_START; /* top of IRQ stack */
18 20 extern ulong FIQ_STACK_START; /* top of FIQ stack */
... ... @@ -58,6 +60,8 @@
58 60 void do_fiq(struct pt_regs *pt_regs);
59 61 void do_irq(struct pt_regs *pt_regswq);
60 62 #endif
  63 +
  64 +#endif /* __ASSEMBLY__ */
61 65  
62 66 #endif /* _U_BOOT_ARM_H_ */
arch/arm/include/asm/u-boot.h
Diff comments   View file @ ac6a6bd
... ... @@ -22,6 +22,7 @@
22 22  
23 23 /* Use the generic board which requires a unified bd_info */
24 24 #include <asm-generic/u-boot.h>
  25 +#include <asm/u-boot-arm.h>
25 26  
26 27 /* For image.h:image_check_target_arch() */
27 28 #ifndef CONFIG_ARM64
... ... @@ -428,7 +428,7 @@
428 428 #ifdef CONFIG_ARM
429 429 # include <asm/mach-types.h>
430 430 # include <asm/setup.h>
431   -# include <asm/u-boot-arm.h> /* ARM version to be fixed! */
  431 +# include <asm/u-boot.h>
432 432 #endif /* CONFIG_ARM */
433 433 #ifdef CONFIG_X86
434 434 # include <asm/u-boot.h>