From ebae16a9c94dba7795e05decb96d44fb0abd7c8d Mon Sep 17 00:00:00 2001 From: Dingqiang Lin Date: Fri, 25 May 2018 11:45:32 +0800 Subject: [PATCH] rk3308: miniloader: update RK3308MINIALL.ini Change-Id: I3ad2a3e0ecd0aef8fef0d40464f043042ff0c10e Signed-off-by: Dingqiang Lin --- RKBOOT/RK3308MINIALL.ini | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/RKBOOT/RK3308MINIALL.ini b/RKBOOT/RK3308MINIALL.ini index 8e22dd8b..61d50331 100755 --- a/RKBOOT/RK3308MINIALL.ini +++ b/RKBOOT/RK3308MINIALL.ini @@ -14,14 +14,7 @@ Path1=bin/rk33/rk3308_usbplug_v1.03.bin NUM=2 LOADER1=FlashData LOADER2=FlashBoot -<<<<<<< HEAD FlashData=bin/rk33/rk3308_ddr_589MHz_v1.21.bin -FlashBoot=bin/rk33/rk3308_miniloader_v1.02.bin -[OUTPUT] -PATH=rk3308_loader_v1.21.102.bin -======= -FlashData=bin/rk33/rk3308_ddr_589MHz_v1.20.bin FlashBoot=bin/rk33/rk3308_miniloader_v1.03.bin [OUTPUT] -PATH=rk3308_loader_v1.20.103.bin ->>>>>>> d3b354f... rk3308: miniloader: fix slc nand flash ecc error +PATH=rk3308_loader_v1.21.103.bin