From 0f12bcf0c284e98ccac1e8478a0beec9dd78c7ff Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 3 Nov 2015 01:30:49 +0100 Subject: update.sh: load fwd_blk from fwd_mmc To avoid code duplication call fwd_blk from fwd_mmc. This adds one more indirection, but since flash_mmc.img is a compatibility script anyway it is not the common case... --- recipes/images/files/library/fwd_mmc.scr | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipes/images/files/library/fwd_mmc.scr b/recipes/images/files/library/fwd_mmc.scr index 4731435..4c8f666 100644 --- a/recipes/images/files/library/fwd_mmc.scr +++ b/recipes/images/files/library/fwd_mmc.scr @@ -1,9 +1,3 @@ #the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img #flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 -test "${board_name}" = "colibri_t20" && setenv drive 0 -test "${board_name}" = "colibri_vf" && setenv drive 0 - -test -n ${board_name} || echo "board_name env not set!" && exit -fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img && source ${loadaddr} +fatload mmc ${drive}:1 ${loadaddr} flash_blk.img && source ${loadaddr} -- cgit v1.2.3