dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: omap3_logic: Enable UUID

Browse Source 
Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
method.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford
2019-04-11 15:24:33 -05:00
committed by Stefano Babic
parent 5449e396eb
commit c7d00f63d1
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/omap35_logic_defconfig
View File

@@ -30,6 +30,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_NAND_LOCK_UNLOCK=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_UUID=y
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"

1
configs/omap35_logic_somlv_defconfig
View File

@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_NAND_LOCK_UNLOCK=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_UUID=y
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"

1
configs/omap3_logic_defconfig
View File

@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_NAND_LOCK_UNLOCK=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_UUID=y
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"

1
configs/omap3_logic_somlv_defconfig
View File

@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_NAND_LOCK_UNLOCK=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_UUID=y
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"

6
include/configs/omap3_logic.h
View File

@@ -67,7 +67,7 @@
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
"mmcrootfstype=ext4 rootwait\0" \ "mmcrootfstype=ext4 rootwait\0" \
"nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \ "nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \
"nandrootfstype=ubifs rootwait\0" \ "nandrootfstype=ubifs rootwait\0" \
@@ -106,7 +106,8 @@
"ramargs=setenv bootargs "\ "ramargs=setenv bootargs "\
"root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \ "root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \
"mmcargs=setenv bootargs "\ "mmcargs=setenv bootargs "\
"root=${mmcroot} rootfstype=${mmcrootfstype}\0" \ "root=PARTUUID=${uuid} " \
"rootfstype=${mmcrootfstype} rw\0" \
"nandargs=setenv bootargs "\ "nandargs=setenv bootargs "\
"root=${nandroot} " \ "root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \ "rootfstype=${nandrootfstype}\0" \
@@ -120,6 +121,7 @@
"loadfdt=mmc rescan; " \ "loadfdt=mmc rescan; " \
"load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \ "load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
"mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \ "mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \
"run finduuid; "\
"run mmcargs; " \ "run mmcargs; " \
"run common_bootargs; " \ "run common_bootargs; " \
"run dump_bootargs; " \ "run dump_bootargs; " \