Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3aa890525b1211857a750e82b38124f798a5cf75

Authored by Fabio Estevam
Committed by Stefano Babic
1 parent a7650486a5
Exists in v2017.01-smarct4x and in 40 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, 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

mx28evk: Fix warning when CONFIG_ENV_IS_IN_SPI_FLASH is selected 

When building a target with CONFIG_ENV_IS_IN_SPI_FLASH the following
warning is seen:

include/configs/mx28evk.h:73:0: warning: "CONFIG_ENV_SIZE" redefined [enabled by default]

Protect the definition of CONFIG_ENV_SIZE to avoid the warning.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

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

include/configs/mx28evk.h
Diff comments   View file @ 3aa8905
... ... @@ -48,7 +48,11 @@
48 48 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
49 49  
50 50 /* Environment */
  51 +#ifndef CONFIG_ENV_IS_IN_SPI_FLASH
51 52 #define CONFIG_ENV_SIZE (16 * 1024)
  53 +#else
  54 +#define CONFIG_ENV_SIZE (4 * 1024)
  55 +#endif
52 56 #define CONFIG_ENV_OVERWRITE
53 57  
54 58 /* Environment is in MMC */
... ... @@ -70,7 +74,6 @@
70 74 /* Environemnt is in SPI flash */
71 75 #if defined(CONFIG_CMD_SF) && defined(CONFIG_ENV_IS_IN_SPI_FLASH)
72 76 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
73   -#define CONFIG_ENV_SIZE 0x1000 /* 4KB */
74 77 #define CONFIG_ENV_OFFSET 0x40000 /* 256K */
75 78 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
76 79 #define CONFIG_ENV_SECT_SIZE 0x1000