Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 463bb19eebab4a5517c60dc9e74de0cc12c19e56

Authored by Marek Vasut
Committed by Tom Rini
1 parent 254d68b601
Exists in v2017.01-smarct4x and in 48 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, 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

spl: Fix guardian macros in spl.h 

Fix the macros guarding the spl.h header for various platforms. Due to
a typo and a propagation of it, the macros went out-of-sync with their
ifdef check, so fix this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>

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

arch/arm/include/asm/arch-am33xx/spl.h
Diff comments   View file @ 463bb19
... ... @@ -5,7 +5,7 @@
5 5 * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7 #ifndef _ASM_ARCH_SPL_H_
8   -#define _ASM_SPL_H_
  8 +#define _ASM_ARCH_SPL_H_
9 9  
10 10 #if defined(CONFIG_TI816X)
11 11 #define BOOT_DEVICE_XIP 2
arch/arm/include/asm/arch-davinci/spl.h
Diff comments   View file @ 463bb19
... ... @@ -5,7 +5,7 @@
5 5 * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7 #ifndef _ASM_ARCH_SPL_H_
8   -#define _ASM_SPL_H_
  8 +#define _ASM_ARCH_SPL_H_
9 9  
10 10 #define BOOT_DEVICE_NAND 1
11 11 #define BOOT_DEVICE_SPI 2
arch/arm/include/asm/arch-mx35/spl.h
Diff comments   View file @ 463bb19
... ... @@ -5,7 +5,7 @@
5 5 * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7 #ifndef _ASM_ARCH_SPL_H_
8   -#define _ASM_SPL_H_
  8 +#define _ASM_ARCH_SPL_H_
9 9  
10 10 #define BOOT_DEVICE_NONE 0
11 11 #define BOOT_DEVICE_XIP 1
arch/arm/include/asm/arch-omap3/spl.h
Diff comments   View file @ 463bb19
... ... @@ -5,7 +5,7 @@
5 5 * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7 #ifndef _ASM_ARCH_SPL_H_
8   -#define _ASM_SPL_H_
  8 +#define _ASM_ARCH_SPL_H_
9 9  
10 10 #define BOOT_DEVICE_NONE 0
11 11 #define BOOT_DEVICE_XIP 1
arch/arm/include/asm/arch-omap4/spl.h
Diff comments   View file @ 463bb19
... ... @@ -5,7 +5,7 @@
5 5 * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7 #ifndef _ASM_ARCH_SPL_H_
8   -#define _ASM_SPL_H_
  8 +#define _ASM_ARCH_SPL_H_
9 9  
10 10 #define BOOT_DEVICE_NONE 0
11 11 #define BOOT_DEVICE_XIP 1
arch/arm/include/asm/arch-omap5/spl.h
Diff comments   View file @ 463bb19
... ... @@ -5,7 +5,7 @@
5 5 * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7 #ifndef _ASM_ARCH_SPL_H_
8   -#define _ASM_SPL_H_
  8 +#define _ASM_ARCH_SPL_H_
9 9  
10 10 #define BOOT_DEVICE_NONE 0
11 11 #define BOOT_DEVICE_XIP 1