layerscape: fix platform_copy_config function
At this moment platform_copy_config function is used for every device
and function "export_partdevice" without "export_bootdevice" causes
multiple errors like that:
"sh: 1: unknown operand"
This patch fix usage of export_partdevice and split platform_copy_config
for sd-card images.
Fixes: 0841b68c91 ("layerscape: support sysupgrade for SD card ext4
rootfs")
Reviewed-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
			
			
This commit is contained in:
		 Pawel Dembicki
					Pawel Dembicki
				
			
				
					committed by
					
						 Adrian Schmutzler
						Adrian Schmutzler
					
				
			
			
				
	
			
			
			 Adrian Schmutzler
						Adrian Schmutzler
					
				
			
						parent
						
							3605eff881
						
					
				
				
					commit
					c51f8030b6
				
			| @@ -109,15 +109,33 @@ platform_do_upgrade_traverse_nandubi() { | |||||||
| 	nand_do_upgrade "$1" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys) | 	nand_do_upgrade "$1" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys) | ||||||
|  |  | ||||||
| } | } | ||||||
| platform_copy_config() { | platform_copy_config_sdboot() { | ||||||
| 	local partdev parttype=ext4 | 	local diskdev partdev parttype=ext4 | ||||||
|  |  | ||||||
|  | 	export_bootdevice && export_partdevice diskdev 0 || { | ||||||
|  | 		echo "Unable to determine upgrade device" | ||||||
|  | 		return 1 | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	if export_partdevice partdev 1; then | 	if export_partdevice partdev 1; then | ||||||
| 		mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt | 		mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt 2>&1 | ||||||
| 		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" | 		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" | ||||||
| 		umount /mnt | 		umount /mnt | ||||||
| 	fi | 	fi | ||||||
| } | } | ||||||
|  | platform_copy_config() { | ||||||
|  | 	local board=$(board_name) | ||||||
|  |  | ||||||
|  | 	case "$board" in | ||||||
|  | 	fsl,ls1012a-frwy-sdboot | \ | ||||||
|  | 	fsl,ls1021a-twr-sdboot | \ | ||||||
|  | 	fsl,ls1043a-rdb-sdboot | \ | ||||||
|  | 	fsl,ls1046a-rdb-sdboot | \ | ||||||
|  | 	fsl,ls1088a-rdb-sdboot) | ||||||
|  | 		platform_copy_config_sdboot | ||||||
|  | 		;; | ||||||
|  | 	esac | ||||||
|  | } | ||||||
| platform_check_image() { | platform_check_image() { | ||||||
| 	local board=$(board_name) | 	local board=$(board_name) | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user