Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 23869bf80b68af9ef1802b9e556f4fd0e9e57fe5

Authored by Dustin Byford
Committed by Tom Rini
1 parent f351eb0f18
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

fw_env: calculate default number of env sectors 

The assumed number of environment sectors (always 1) leads to an
incorrect top_of_range calculation in fw.env.c when a flash device has
an erase block size smaller than the environment data size (number of
environment sectors > 1).

This change updates the default number of environment sectors to at
least cover the size of the environment.

Also corrected a false statement about the number of sectors column in
fw_env.config.

Signed-off-by: Dustin Byford <dustin@cumulusnetworks.com>

Showing 2 changed files with 9 additions and 7 deletions Side-by-side Diff

... ... @@ -1246,9 +1246,10 @@
1246 1246 strcpy (DEVNAME (0), DEVICE1_NAME);
1247 1247 DEVOFFSET (0) = DEVICE1_OFFSET;
1248 1248 ENVSIZE (0) = ENV1_SIZE;
1249   - /* Default values are: erase-size=env-size, #sectors=1 */
  1249 + /* Default values are: erase-size=env-size */
1250 1250 DEVESIZE (0) = ENVSIZE (0);
1251   - ENVSECTORS (0) = 1;
  1251 + /* #sectors=env-size/erase-size (rounded up) */
  1252 + ENVSECTORS (0) = (ENVSIZE(0) + DEVESIZE(0) - 1) / DEVESIZE(0);
1252 1253 #ifdef DEVICE1_ESIZE
1253 1254 DEVESIZE (0) = DEVICE1_ESIZE;
1254 1255 #endif
1255 1256  
... ... @@ -1260,9 +1261,10 @@
1260 1261 strcpy (DEVNAME (1), DEVICE2_NAME);
1261 1262 DEVOFFSET (1) = DEVICE2_OFFSET;
1262 1263 ENVSIZE (1) = ENV2_SIZE;
1263   - /* Default values are: erase-size=env-size, #sectors=1 */
  1264 + /* Default values are: erase-size=env-size */
1264 1265 DEVESIZE (1) = ENVSIZE (1);
1265   - ENVSECTORS (1) = 1;
  1266 + /* #sectors=env-size/erase-size (rounded up) */
  1267 + ENVSECTORS (1) = (ENVSIZE(1) + DEVESIZE(1) - 1) / DEVESIZE(1);
1266 1268 #ifdef DEVICE2_ESIZE
1267 1269 DEVESIZE (1) = DEVICE2_ESIZE;
1268 1270 #endif
... ... @@ -1320,8 +1322,8 @@
1320 1322 DEVESIZE(i) = ENVSIZE(i);
1321 1323  
1322 1324 if (rc < 5)
1323   - /* Default - 1 sector */
1324   - ENVSECTORS (i) = 1;
  1325 + /* Assume enough env sectors to cover the environment */
  1326 + ENVSECTORS (i) = (ENVSIZE(i) + DEVESIZE(i) - 1) / DEVESIZE(i);
1325 1327  
1326 1328 i++;
1327 1329 }
tools/env/fw_env.config
Diff comments   View file @ 23869bf
1 1 # Configuration file for fw_(printenv/setenv) utility.
2 2 # Up to two entries are valid, in this case the redundant
3 3 # environment sector is assumed present.
4   -# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash.
  4 +# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash.
5 5 # Futhermore, if the Flash sector size is ommitted, this value is assumed to
6 6 # be the same as the Environment size, which is valid for NOR and SPI-dataflash
7 7