Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0dd1c31d14e786bf6152c3e7fff188b708b96cf9

Authored by Egli, Samuel
Committed by Tom Rini
1 parent 5f9c58e97e
Exists in v2017.01-smarct4x and in 34 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-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, 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

siemens,am33x: adjust mtd partition 

Use one mtd partition for rootfs and configuration by
means of ubi volumes and get rid of configuration partition.
We can use partition layout for both 256MB and 512MB flash.

Signed-off-by: Samuel Egli <samuel.egli@siemens.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Roger Meier <r.meier@siemens.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Heiko Schocher <hs@denx.de>

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

include/configs/siemens-am33x-common.h
Diff comments   View file @ 0dd1c31
... ... @@ -480,7 +480,7 @@
480 480  
481 481 /*
482 482 * Variant 2 partition layout
483   - * chip-size = 256MiB
  483 + * chip-size = 256MiB or 512 MiB
484 484 *| name | size | address area |
485 485 *-------------------------------------------------------
486 486 *| spl | 128.000 KiB | 0x 0..0x 1ffff |
487 487  
488 488  
... ... @@ -490,24 +490,24 @@
490 490 *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff |
491 491 *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff |
492 492 *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff |
493   - *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff |
494   - *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff |
495   - *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff |
  493 + *| mtdoops | 512.000 KiB | 0x 360000..0x 3dffff |
  494 + *| (256) rootfs | 252.125 MiB | 0x 3E0000..0x fffffff |
  495 + *| (512) rootfs | 508.125 MiB | 0x 3E0000..0x1fffffff |
496 496 *-------------------------------------------------------
497 497 */
498 498  
499 499 #define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
500   - "128k(spl)," \
501   - "128k(spl.backup1)," \
502   - "128k(spl.backup2)," \
503   - "128k(spl.backup3)," \
504   - "1920k(u-boot)," \
505   - "512k(u-boot.env0)," \
506   - "512k(u-boot.env1)," \
507   - "148m(rootfs)," \
508   - "512k(mtdoops)," \
509   - "-(configuration)"
  500 + "128k(spl)," \
  501 + "128k(spl.backup1)," \
  502 + "128k(spl.backup2)," \
  503 + "128k(spl.backup3)," \
  504 + "1920k(u-boot)," \
  505 + "512k(u-boot.env0)," \
  506 + "512k(u-boot.env1)," \
  507 + "512k(mtdoops)," \
  508 + "-(rootfs)"
510 509  
  510 +
511 511 #define DFU_ALT_INFO_NAND_V2 \
512 512 "spl part 0 1;" \
513 513 "spl.backup1 part 0 2;" \
... ... @@ -516,8 +516,7 @@
516 516 "u-boot part 0 5;" \
517 517 "u-boot.env0 part 0 6;" \
518 518 "u-boot.env1 part 0 7;" \
519   - "rootfs partubi 0 8;" \
520   - "configuration partubi 0 10"
  519 + "rootfs partubi 0 9" \
521 520  
522 521 #define CONFIG_ENV_SETTINGS_NAND_V2 \
523 522 "nand_active_ubi_vol=rootfs_a\0" \
... ... @@ -534,7 +533,7 @@
534 533 "setenv nand_active_ubi_vol ${rootfs_name}_b;" \
535 534 "fi;" \
536 535 "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \
537   - "ubi.mtd=7,2048 ubi.mtd=9,2048;" \
  536 + "ubi.mtd=rootfs,2048;" \
538 537 "setenv bootargs ${bootargs} " \
539 538 "root=${nand_root} noinitrd ${mtdparts} " \
540 539 "rootfstype=${nand_root_fs_type} ip=${ip_method} " \