Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 96044745cb8c086d47215f4aa7b4defb1d1fec57

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 5847084f6b
Exists in v2017.01-smarct4x and in 25 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_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.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-n7.1.2_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

env: avoid build error for boards without CONFIG_SYS_{CPU, BOARD} 

If CONFIG_ENV_VARS_UBOOT_CONFIG is enabled (it is by distro), this
code causes build error for boards without CONFIG_SYS_{CPU,_BOARD}.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

include/env_default.h
Diff comments   View file @ 9604474
... ... @@ -90,9 +90,13 @@
90 90 #endif
91 91 #ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
92 92 "arch=" CONFIG_SYS_ARCH "\0"
  93 +#ifdef CONFIG_SYS_CPU
93 94 "cpu=" CONFIG_SYS_CPU "\0"
  95 +#endif
  96 +#ifdef CONFIG_SYS_BOARD
94 97 "board=" CONFIG_SYS_BOARD "\0"
95 98 "board_name=" CONFIG_SYS_BOARD "\0"
  99 +#endif
96 100 #ifdef CONFIG_SYS_VENDOR
97 101 "vendor=" CONFIG_SYS_VENDOR "\0"
98 102 #endif