rk3308: miniloader: fix slc nand flash ecc error

Change-Id: Ife715ec12386e379f45df2403238d023948fae3e
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>

RKBOOT/RK3308MINIALL.ini

@@ -2,19 +2,26 @@
 NAME=RK3308
 [VERSION]
 MAJOR=1
-MINOR=02
+MINOR=03
 [CODE471_OPTION]
 NUM=1
 Path1=bin/rk33/rk3308_ddr_589MHz_v1.21.bin
 Sleep=1
 [CODE472_OPTION]
 NUM=1
-Path1=bin/rk33/rk3308_usbplug_v1.02.bin
+Path1=bin/rk33/rk3308_usbplug_v1.03.bin
 [LOADER_OPTION]
 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