Feature][R306-MTN][task-view-1025] add support for slic
Change-Id: I470f6c5ac3ff48247fae20d73eccc70b25fc9045
diff --git a/Makefile b/Makefile
index af66675..125feb9 100755
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@
@echo example MD310 : make AP_PRJ=prj_cpe_min BOOT_PRJ=ufi_mini PACK_PRJ=prj_cpe PATH_PRJ=lynq/MD310
@echo example MD310EU : make AP_PRJ=prj_cpe_min BOOT_PRJ=ufi_mini PACK_PRJ=prj_cpe PATH_PRJ=lynq/MD310EU
@echo example S300_AIC : make AP_PRJ=prj_mifi_min BOOT_PRJ=mifi_mini_64 PACK_PRJ=prj_mifi PATH_PRJ=lynq/S300_AIC
+ @echo example R306_MTN : make AP_PRJ=prj_cpe BOOT_PRJ=cpe PACK_PRJ=prj_cpe PATH_PRJ=lynq/R306_MTN
@echo The default value of AP_PRJ is prj_cpe_min. The following values are optional :
@ls ap/project/zx297520v3/*/ -d | xargs -I {} basename "{}" | tr '\n' ' '
@echo
diff --git a/allbins/zx297520v3/prj_cpe/allbins_230a/product.ini b/allbins/zx297520v3/prj_cpe/allbins_230a/product.ini
new file mode 100755
index 0000000..2b80acb
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/allbins_230a/product.ini
@@ -0,0 +1,9 @@
+[imagefs]
+largefile_split_enable=no
+mkfs_jffs2=-v -X lzo --pagesize=0x800 --eraseblock=0x20000 --little-endian --no-cleanmarkers --squash
+
+[nvrofs]
+mkfs_jffs2=-v -X lzo --pagesize=0x800 --eraseblock=0x20000 --little-endian --no-cleanmarkers --squash
+
+[resource]
+mkfs_jffs2=-v -X lzo --pagesize=0x800 --eraseblock=0x20000 --little-endian --no-cleanmarkers --squash
\ No newline at end of file
diff --git a/allbins/zx297520v3/prj_cpe/elf_230a/.gitkeep b/allbins/zx297520v3/prj_cpe/elf_230a/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/elf_230a/.gitkeep
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_cpe/nv_230a/Ref_nvrw_0x26C00.bin
new file mode 100755
index 0000000..e920f1d
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/drv_nvrw_0x00012000.bin b/allbins/zx297520v3/prj_cpe/nv_230a/drv_nvrw_0x00012000.bin
new file mode 100755
index 0000000..2581d47
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/drv_nvrw_0x00012000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/phyLteaAmtUser_nvrwo_0x00007800.bin b/allbins/zx297520v3/prj_cpe/nv_230a/phyLteaAmtUser_nvrwo_0x00007800.bin
new file mode 100755
index 0000000..72f6c9d
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/phyLteaAmtUser_nvrwo_0x00007800.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/phyWcdmaAmtUser_nvrwo_0x00005000.bin b/allbins/zx297520v3/prj_cpe/nv_230a/phyWcdmaAmtUser_nvrwo_0x00005000.bin
new file mode 100755
index 0000000..2bb553a
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/phyWcdmaAmtUser_nvrwo_0x00005000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/phycom_nvrwo_0x0002BC00.bin b/allbins/zx297520v3/prj_cpe/nv_230a/phycom_nvrwo_0x0002BC00.bin
new file mode 100755
index 0000000..69601e2
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/phycom_nvrwo_0x0002BC00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/psPriData_nvrw_0x00002000.bin b/allbins/zx297520v3/prj_cpe/nv_230a/psPriData_nvrw_0x00002000.bin
new file mode 100755
index 0000000..032f475
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/psPriData_nvrw_0x00002000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/voice_nvrw_0x00016000.bin b/allbins/zx297520v3/prj_cpe/nv_230a/voice_nvrw_0x00016000.bin
new file mode 100755
index 0000000..cedfd60
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/voice_nvrw_0x00016000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/nv_230a/voicen_nvrw_0x00016000.bin b/allbins/zx297520v3/prj_cpe/nv_230a/voicen_nvrw_0x00016000.bin
new file mode 100755
index 0000000..7cf25d8
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/nv_230a/voicen_nvrw_0x00016000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_cpe/scripts/AllInOneImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts/AllInOneImage_230a.ini
new file mode 100755
index 0000000..d2432d5
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts/AllInOneImage_230a.ini
@@ -0,0 +1,28 @@
+[GeneralSetting]
+;0:NorFlash; 1:NandFlash; 2:emmc; 3:sata
+storage_type=1
+is_nv_coalition=1
+TLoaderAddr=0x80000
+
+[Output]
+FilePath=7520V3SC_CPE_230A.bin
+
+[TLoader]
+FilePath=..\allbins_230A\tloader.bin
+
+[TBoot]
+FilePath=..\allbins_230A\tboot.bin
+
+[Partition]
+FilePath=..\allbins_230A\partition.bin
+
+[ProductInfo]
+FilePath=..\allbins_230A\product.ini
+
+[Image]
+..\allbins_230A\ap_imagefs.img
+..\allbins_230A\ap_userdata.img
+..\allbins_230A\ap_rootfs.img
+..\allbins_230A\uboot.bin
+..\allbins_230A\uboot-mirr.bin
+..\allbins_230A\zloader.bin
diff --git a/allbins/zx297520v3/prj_cpe/scripts/FsImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts/FsImage_230a.ini
new file mode 100755
index 0000000..9072c80
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts/FsImage_230a.ini
@@ -0,0 +1,19 @@
+
+;NV合并
+[FS]
+Count=1
+fs0=..\allbins_230A\ap_imagefs.img
+fs1=..\allbins_230A\ap_nvrofs.img
+
+
+[fs0]
+..\allbins_230A\ap_cpuap.bin
+..\allbins_230A\ap_recovery.bin
+..\allbins_230A\evb_cpuphy.bin
+..\allbins_230A\evb_cpurpm.img
+..\allbins_230A\nvrwall.bin
+..\allbins_230A\nvrwoall.bin
+
+[fs1]
+..\allbins_230A\nvroall.bin
+..\allbins_230A\nvrowall.bin
diff --git a/allbins/zx297520v3/prj_cpe/scripts/NVRWInOneImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts/NVRWInOneImage_230a.ini
new file mode 100755
index 0000000..191fcfa
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts/NVRWInOneImage_230a.ini
@@ -0,0 +1,21 @@
+
+;NV合并
+[NVIMAGE]
+;NvroPath=modem_nvro.bin
+NvrwPath=..\allbins_230a\nvrwall.bin
+
+[NVRO]
+;举例..\..\..\zx297520\nv\CA_3M_BX\amtComm_nvro_0x00000000.bin
+
+[NVRW]
+;举例..\..\..\zx297520\nv\CA_3M_BX\at_nvrw_0x00022000.bin
+..\allbins_230a\ati_nvrw_0x00000800.bin
+..\allbins_230a\at_nvrw_0x00001000.bin
+..\allbins_230a\drv_nvrw_0x00012000.bin
+..\allbins_230a\phycfg_nvrw_0x00001400.bin
+..\allbins_230a\psPriData_nvrw_0x00002000.bin
+..\allbins_230a\psPubData_nvrw_0x00001C00.bin
+..\allbins_230a\Ref_nvrw_0x26C00.bin
+..\allbins_230a\tsp_nvrw_0x00000000.bin
+..\allbins_230a\voice_nvrw_0x00016000.bin
+
diff --git a/allbins/zx297520v3/prj_cpe/scripts/NVRWOInOneImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts/NVRWOInOneImage_230a.ini
new file mode 100755
index 0000000..28236b2
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts/NVRWOInOneImage_230a.ini
@@ -0,0 +1,23 @@
+
+;NV合并
+[NVIMAGE]
+;NvroPath=modem_nvro.bin
+NvrwoPath=..\allbins_230A\nvrwoall.bin
+
+[NVRO]
+;举例..\..\..\zx297520\nv\CA_3M_BX\amtComm_nvro_0x00000000.bin
+
+[NVRWO]
+;举例..\..\..\zx297520\nv\CA_3M_BX\at_nvrw_0x00022000.bin
+..\allbins_230A\phycom_nvrwo_0x0002BC00.bin
+..\allbins_230A\phyGgeAmtUser_nvrwo_0x00003400.bin
+..\allbins_230A\phyGgeCom_nvrwo_0x0000EC00.bin
+..\allbins_230A\phyLteaAmtUser_nvrwo_0x00007800.bin
+..\allbins_230A\phyLteaCom_nvrwo_0x00012C00.bin
+..\allbins_230A\phyLtetxtable_nvrwo_0x0001BC00.bin
+..\allbins_230A\phyTdsAmtUser_nvrwo_0x00002800.bin
+..\allbins_230A\phyTdsCom_nvrwo_0x0000E400.bin
+..\allbins_230A\phyWcdmaAmtUser_nvrwo_0x00005000.bin
+..\allbins_230A\phyWcdmaCom_nvrwo_0x00012400.bin
+..\allbins_230A\zxRfM0_nvrwo_0x00016C00.bin
+
diff --git a/allbins/zx297520v3/prj_cpe/scripts/copybin_cpe_230a.bat b/allbins/zx297520v3/prj_cpe/scripts/copybin_cpe_230a.bat
new file mode 100755
index 0000000..a454cb5
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts/copybin_cpe_230a.bat
@@ -0,0 +1,66 @@
+@echo off
+
+
+set COPY_CURPATH=%cd%
+set COPY_TOPDIR=%COPY_CURPATH%\..\..\..\..
+set COPY_CHIP_NAME=zx297520v3
+set COPY_PRJ_NAME=prj_cpe
+set COPY_PRJ_BOOTNAME=cpe
+set COPY_PRJ_APNAME=prj_cpe
+set RFTYPE=230A
+set DCXO=_dcxo
+set COPY_RPMBINPATH=%COPY_TOPDIR%\rpm\project\%COPY_CHIP_NAME%\bin\tos\modem_7520v3
+set COPY_CPUBINPATH=%COPY_TOPDIR%\allbins\%COPY_CHIP_NAME%\prj_evb\nv
+set COPY_CPUBIN_RF230A_PATH=%COPY_TOPDIR%\allbins\%COPY_CHIP_NAME%\prj_evb\nv_230a
+set COPY_PHYBINPATH=%COPY_TOPDIR%\cp\phy\bin\%COPY_CHIP_NAME%\merge_lte_230a_bin\ps_dcxo
+set COPY_NVBINPATH=%COPY_TOPDIR%\allbins\%COPY_CHIP_NAME%\%COPY_PRJ_NAME%\nv_230a
+set COPY_ALLBINDIR=%COPY_TOPDIR%\allbins\%COPY_CHIP_NAME%\%COPY_PRJ_NAME%\allbins_230a
+set COPY_OTHERBINDIR=%COPY_TOPDIR%\allbins\%COPY_CHIP_NAME%\%COPY_PRJ_NAME%\elf_230a
+set COPY_PARTITIONDIR=%COPY_TOPDIR%\allbins\%COPY_CHIP_NAME%\%COPY_PRJ_NAME%\config
+set COPY_BOOT_DIR=%COPY_TOPDIR%\boot
+
+set COPY_INVALIDNV=amtComm_nvro_0x00000000.bin phyGgeAmtCali_nvro_0x00050000.bin ^
+ phyLteAmtCali_nvro_0x00008000.bin phyTdsAmtCali_nvro_0x00048000.bin ^
+ phyWcdmaAmtCali_nvro_0x00058000.bin phyLteaAmtCali_nvro_0x00078000.bin
+
+echo "Enter call copybin.bat!!!!"
+
+call :CopyFile %COPY_RPMBINPATH%\evb_cpurpm.img %COPY_ALLBINDIR%\
+call :CopyFile %COPY_PHYBINPATH%\evb_cpuphy.bin %COPY_ALLBINDIR%\
+call :CopyFile %COPY_CPUBINPATH%\ %COPY_ALLBINDIR%\
+call :CopyFile %COPY_CPUBINPATH%\merge_lte\ %COPY_ALLBINDIR%\
+if not exist %COPY_ALLBINDIR%\config mkdir %COPY_ALLBINDIR%\config
+xcopy /e /y %COPY_CPUBINPATH%\config %COPY_ALLBINDIR%\config
+call :CopyFile %COPY_CPUBIN_RF230A_PATH%\ %COPY_ALLBINDIR%\
+xcopy /e /y %COPY_CPUBIN_RF230A_PATH%\config %COPY_ALLBINDIR%\config
+call :CopyFile %COPY_NVBINPATH%\ %COPY_ALLBINDIR%\
+call :CopyFile %COPY_PARTITIONDIR%\ %COPY_ALLBINDIR%\
+
+
+call :CopyFile %COPY_RPMBINPATH%\evb_cpurpm.elf %COPY_OTHERBINDIR%\
+call :CopyFile %COPY_RPMBINPATH%\evb_cpurpm.map %COPY_OTHERBINDIR%\
+call :CopyFile %COPY_PHYBINPATH%\evb_cpuphy.map %COPY_OTHERBINDIR%\
+call :CopyFile %COPY_PHYBINPATH%\evb_cpuphy_out.7z %COPY_OTHERBINDIR%\
+
+
+
+xcopy /e /y %COPY_TOPDIR%\ap\project\zx297520v3\%COPY_PRJ_APNAME%\bin\%RFTYPE%%DCXO%\allbins\* %COPY_ALLBINDIR%\
+xcopy /e /y %COPY_TOPDIR%\ap\project\zx297520v3\%COPY_PRJ_APNAME%\bin\%RFTYPE%%DCXO%\elfs\* %COPY_OTHERBINDIR%\
+
+
+xcopy /e /y %COPY_TOPDIR%\boot\prj\zx297520v3\%COPY_PRJ_BOOTNAME%\bin\dl_on\zloader.bin %COPY_ALLBINDIR%\
+xcopy /e /y %COPY_TOPDIR%\boot\prj\zx297520v3\%COPY_PRJ_BOOTNAME%\bin\uboot.bin %COPY_ALLBINDIR%\
+xcopy /e /y %COPY_TOPDIR%\boot\prj\zx297520v3\%COPY_PRJ_BOOTNAME%\bin\uboot-mirr.bin %COPY_ALLBINDIR%\
+xcopy /e /y %COPY_TOPDIR%\boot\prj\zx297520v3\%COPY_PRJ_BOOTNAME%\bin\tloader.bin %COPY_ALLBINDIR%\
+xcopy /e /y %COPY_TOPDIR%\boot\prj\zx297520v3\%COPY_PRJ_BOOTNAME%\bin\tboot.bin %COPY_ALLBINDIR%\
+
+
+for %%i in (%COPY_INVALIDNV%) do del %COPY_ALLBINDIR%\%%i /F
+
+goto :EOF
+
+
+:CopyFile
+copy %1 %2 /Y || echo "copy %1 to %2 failed!!!"
+goto :EOF
+
diff --git a/allbins/zx297520v3/prj_cpe/scripts/merge.bat b/allbins/zx297520v3/prj_cpe/scripts/merge.bat
index 07affad..d6ac0ee 100755
--- a/allbins/zx297520v3/prj_cpe/scripts/merge.bat
+++ b/allbins/zx297520v3/prj_cpe/scripts/merge.bat
@@ -5,13 +5,17 @@
%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWInOneImage.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWOInOneImage.ini
+%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWInOneImage_230a.ini
+%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWOInOneImage_230a.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWInOneImage_switch.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWOInOneImage_switch.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWInOneImage_min.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -n NVRWOInOneImage_min.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -f FsImage.ini
+%HomeDir%\..\..\..\..\tools\Image\Image.exe -f FsImage_230a.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -f FsImage_switch.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -f FsImage_min.ini
+%HomeDir%\..\..\..\..\tools\Image\Image.exe -m AllInOneImage_230a.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -m AllInOneImage.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -m AllInOneImage_switch.ini
%HomeDir%\..\..\..\..\tools\Image\Image.exe -m AllInOneImage_min.ini
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/AllInOneImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts_linux/AllInOneImage_230a.ini
new file mode 100755
index 0000000..8cfe9e8
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/AllInOneImage_230a.ini
@@ -0,0 +1,28 @@
+[GeneralSetting]
+;0:NorFlash; 1:NandFlash; 2:emmc; 3:sata
+storage_type=1
+is_nv_coalition=1
+TLoaderAddr=0x80000
+
+[Output]
+FilePath=7520V3SC_CPE_230A.bin
+
+[TLoader]
+FilePath=../allbins_230a/tloader.bin
+
+[TBoot]
+FilePath=../allbins_230a/tboot.bin
+
+[Partition]
+FilePath=../allbins_230a/partition.bin
+
+[ProductInfo]
+FilePath=../allbins_230a/product.ini
+
+[Image]
+../allbins_230a/ap_imagefs.img
+../allbins_230a/ap_userdata.img
+../allbins_230a/ap_rootfs.img
+../allbins_230a/uboot.bin
+../allbins_230a/uboot-mirr.bin
+../allbins_230a/zloader.bin
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/FsImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts_linux/FsImage_230a.ini
new file mode 100755
index 0000000..138bf36
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/FsImage_230a.ini
@@ -0,0 +1,19 @@
+
+;NV合并
+[FS]
+Count=1
+fs0=../allbins_230a/ap_imagefs.img
+fs1=../allbins_230a/ap_nvrofs.img
+
+
+[fs0]
+../allbins_230a/ap_cpuap.bin
+../allbins_230a/ap_recovery.bin
+../allbins_230a/evb_cpuphy.bin
+../allbins_230a/evb_cpurpm.img
+../allbins_230a/nvrwall.bin
+../allbins_230a/nvrwoall.bin
+
+[fs1]
+../allbins_230a/nvroall.bin
+../allbins_230a/nvrowall.bin
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/Makefile b/allbins/zx297520v3/prj_cpe/scripts_linux/Makefile
old mode 100644
new mode 100755
index afb4523..0e3072c
--- a/allbins/zx297520v3/prj_cpe/scripts_linux/Makefile
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/Makefile
@@ -2,4 +2,5 @@
pack:
-./copybin_cpe_aic8800dw.sh
-./copybin_cpe_min.sh
+ -./copybin_cpe_230a.sh
./merge.sh
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/NVRWInOneImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts_linux/NVRWInOneImage_230a.ini
new file mode 100755
index 0000000..7d91f2c
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/NVRWInOneImage_230a.ini
@@ -0,0 +1,21 @@
+
+;NV合并
+[NVIMAGE]
+;NvroPath=modem_nvro.bin
+NvrwPath=../allbins_230a/nvrwall.bin
+
+[NVRO]
+;举例../../../zx297520/nv/CA_3M_BX/amtComm_nvro_0x00000000.bin
+
+[NVRW]
+;举例../../../zx297520/nv/CA_3M_BX/at_nvrw_0x00022000.bin
+../allbins_230a/ati_nvrw_0x00000800.bin
+../allbins_230a/at_nvrw_0x00001000.bin
+../allbins_230a/drv_nvrw_0x00012000.bin
+../allbins_230a/phycfg_nvrw_0x00001400.bin
+../allbins_230a/psPriData_nvrw_0x00002000.bin
+../allbins_230a/psPubData_nvrw_0x00001C00.bin
+../allbins_230a/Ref_nvrw_0x26C00.bin
+../allbins_230a/tsp_nvrw_0x00000000.bin
+../allbins_230a/voice_nvrw_0x00016000.bin
+
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/NVRWOInOneImage_230a.ini b/allbins/zx297520v3/prj_cpe/scripts_linux/NVRWOInOneImage_230a.ini
new file mode 100755
index 0000000..e13e7d9
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/NVRWOInOneImage_230a.ini
@@ -0,0 +1,23 @@
+
+;NV合并
+[NVIMAGE]
+;NvroPath=modem_nvro.bin
+NvrwoPath=../allbins_230a/nvrwoall.bin
+
+[NVRO]
+;举例../../../zx297520/nv/CA_3M_BX/amtComm_nvro_0x00000000.bin
+
+[NVRWO]
+;举例../../../zx297520/nv/CA_3M_BX/at_nvrw_0x00022000.bin
+../allbins_230a/phycom_nvrwo_0x0002BC00.bin
+../allbins_230a/phyGgeAmtUser_nvrwo_0x00003400.bin
+../allbins_230a/phyGgeCom_nvrwo_0x0000EC00.bin
+../allbins_230a/phyLteaAmtUser_nvrwo_0x00007800.bin
+../allbins_230a/phyLteaCom_nvrwo_0x00012C00.bin
+../allbins_230a/phyLtetxtable_nvrwo_0x0001BC00.bin
+../allbins_230a/phyTdsAmtUser_nvrwo_0x00002800.bin
+../allbins_230a/phyTdsCom_nvrwo_0x0000E400.bin
+../allbins_230a/phyWcdmaAmtUser_nvrwo_0x00005000.bin
+../allbins_230a/phyWcdmaCom_nvrwo_0x00012400.bin
+../allbins_230a/zxRfM0_nvrwo_0x00016C00.bin
+
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/copybin_cpe_230a.sh b/allbins/zx297520v3/prj_cpe/scripts_linux/copybin_cpe_230a.sh
new file mode 100755
index 0000000..1b60e46
--- /dev/null
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/copybin_cpe_230a.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+COPY_CURPATH=$(pwd)
+COPY_TOPDIR="${COPY_CURPATH}/../../../.."
+# 设å®è¯çå称å项ç®åç§?
+COPY_CHIP_NAME="zx297520v3"
+COPY_PRJ_BOOTNAME="cpe"
+COPY_PRJ_NAME="prj_cpe"
+COPY_PRJ_APNAME="prj_cpe"
+RFTYPE="230A"
+DCXO="_dcxo"
+FLASH=""
+# 设定各个路径
+COPY_RPMBINPATH="${COPY_TOPDIR}/rpm/project/${COPY_CHIP_NAME}/bin/tos/modem_7520v3"
+COPY_CPUBINPATH="${COPY_TOPDIR}/allbins/${COPY_CHIP_NAME}/prj_evb/nv"
+COPY_CPUBIN_RF230A_PATH="${COPY_TOPDIR}/allbins/${COPY_CHIP_NAME}/prj_evb/nv_230a"
+COPY_PHYBINPATH="${COPY_TOPDIR}/cp/phy/bin/${COPY_CHIP_NAME}/merge_lte_230a_bin/ps${DCXO}"
+
+COPY_NVBINPATH="${COPY_TOPDIR}/allbins/${COPY_CHIP_NAME}/${COPY_PRJ_NAME}/nv_230a"
+COPY_ALLBINDIR="${COPY_TOPDIR}/allbins/${COPY_CHIP_NAME}/${COPY_PRJ_NAME}/allbins_230a"
+COPY_OTHERBINDIR="${COPY_TOPDIR}/allbins/${COPY_CHIP_NAME}/${COPY_PRJ_NAME}/elf_230a"
+COPY_PARTITIONDIR="${COPY_TOPDIR}/allbins/${COPY_CHIP_NAME}/${COPY_PRJ_NAME}/config${FLASH}"
+COPY_BOOT_DIR="${COPY_TOPDIR}/boot"
+echo "Enter call copybin.bat!!!!"
+
+
+cp $COPY_RPMBINPATH/evb_cpurpm.img $COPY_ALLBINDIR/
+cp $COPY_PHYBINPATH/evb_cpuphy.bin $COPY_ALLBINDIR/
+cp -r $COPY_CPUBINPATH/* $COPY_ALLBINDIR/
+cp -r $COPY_CPUBINPATH/merge_lte/* $COPY_ALLBINDIR/
+if [ ! -d $COPY_ALLBINDIR/config ];then
+ mkdir $COPY_ALLBINDIR/config
+fi
+cp -r $COPY_CPUBINPATH/config $COPY_ALLBINDIR/config
+cp -r $COPY_CPUBIN_RF230A_PATH/* $COPY_ALLBINDIR/
+cp -r $COPY_CPUBIN_RF230A_PATH/config $COPY_ALLBINDIR/config
+cp -r $COPY_NVBINPATH/* $COPY_ALLBINDIR/
+cp -r $COPY_PARTITIONDIR/* $COPY_ALLBINDIR/
+
+cp $COPY_RPMBINPATH/evb_cpurpm.elf ${COPY_OTHERBINDIR}/
+cp $COPY_RPMBINPATH/evb_cpurpm.map ${COPY_OTHERBINDIR}/
+cp $COPY_PHYBINPATH/evb_cpuphy.map ${COPY_OTHERBINDIR}/
+cp $COPY_PHYBINPATH/evb_cpuphy_out.7z ${COPY_OTHERBINDIR}/
+
+COPY_INVALIDNV="amtComm_nvro_0x00000000.bin phyGgeAmtCali_nvro_0x00050000.bin \
+ phyLteAmtCali_nvro_0x00008000.bin phyTdsAmtCali_nvro_0x00048000.bin \
+ phyWcdmaAmtCali_nvro_0x00058000.bin phyLteaAmtCali_nvro_0x00078000.bin"
+
+for file in $COPY_INVALIDNV_ARRAY; do
+ rm -f "$COPY_ALLBINDIR/$file"
+done
+
+cp -r ${COPY_TOPDIR}/ap/project/zx297520v3/${COPY_PRJ_APNAME}/bin/${RFTYPE}${DCXO}/allbins/* ${COPY_ALLBINDIR}/
+cp -r ${COPY_TOPDIR}/ap/project/zx297520v3/${COPY_PRJ_APNAME}/bin/${RFTYPE}${DCXO}/elfs/* ${COPY_OTHERBINDIR}/
+
+
+#boot allbins
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/dl_on/zloader.bin ${COPY_ALLBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/uboot.bin ${COPY_ALLBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/uboot-mirr.bin ${COPY_ALLBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/tloader.bin ${COPY_ALLBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/tboot.bin ${COPY_ALLBINDIR}/
+
+#boot elf
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/dl_on/z-load.map ${COPY_OTHERBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/dl_on/z-load ${COPY_OTHERBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/u-boot.map ${COPY_OTHERBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/u-boot ${COPY_OTHERBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/z-load.map ${COPY_OTHERBINDIR}/
+cp ${COPY_TOPDIR}/boot/prj/zx297520v3/${COPY_PRJ_BOOTNAME}/bin/z-load ${COPY_OTHERBINDIR}/
+
diff --git a/allbins/zx297520v3/prj_cpe/scripts_linux/merge.sh b/allbins/zx297520v3/prj_cpe/scripts_linux/merge.sh
index f6b329d..d06164c 100755
--- a/allbins/zx297520v3/prj_cpe/scripts_linux/merge.sh
+++ b/allbins/zx297520v3/prj_cpe/scripts_linux/merge.sh
@@ -6,13 +6,17 @@
./Image -n NVRWOInOneImage_switch.ini
./Image -n NVRWInOneImage_min.ini
./Image -n NVRWOInOneImage_min.ini
+./Image -n NVRWInOneImage_230a.ini
+./Image -n NVRWOInOneImage_230a.ini
./Image -n NVRWInOneImage_aic8800dw.ini
./Image -n NVRWOInOneImage_aic8800dw.ini
./Image -f FsImage.ini
./Image -f FsImage_switch.ini
./Image -f FsImage_min.ini
+./Image -f FsImage_230a.ini
./Image -f FsImage_aic8800dw.ini
./Image -m AllInOneImage.ini
./Image -m AllInOneImage_switch.ini
./Image -m AllInOneImage_min.ini
+./Image -m AllInOneImage_230a.ini
./Image -m AllInOneImage_aic8800dw.ini
diff --git a/lynq/R306_MTN/ap/os/linux/linux-3.4.x/arch/arm/mach-zx297520v3/include/mach/gpio_cfg.h b/lynq/R306_MTN/ap/os/linux/linux-3.4.x/arch/arm/mach-zx297520v3/include/mach/gpio_cfg.h
index 20ed3e1..b6c7404 100644
--- a/lynq/R306_MTN/ap/os/linux/linux-3.4.x/arch/arm/mach-zx297520v3/include/mach/gpio_cfg.h
+++ b/lynq/R306_MTN/ap/os/linux/linux-3.4.x/arch/arm/mach-zx297520v3/include/mach/gpio_cfg.h
@@ -416,8 +416,10 @@
#define EARP_INT_FUNC_SEL GPIO53_EXT_INT6
/************* SLIC ***************/
-#ifdef CONFIG_ARCH_ZX297520V3_CPE_SWITCH
-#define SLIC_PWR_CTRL ZX29_GPIO_132
+
+#if defined(CONFIG_ARCH_ZX297520V3_CPE_SWITCH)|| defined(CONFIG_ARCH_ZX297520V3_CPE)
+#define SLIC_PWR_CTRL ZX29_GPIO_128
+#define SLIC_PWR_CTRL_EN ZX29_GPIO_119
#endif
#endif
diff --git a/lynq/R306_MTN/ap/os/linux/linux-3.4.x/drivers/slic_tw/arch/slic_tw.c b/lynq/R306_MTN/ap/os/linux/linux-3.4.x/drivers/slic_tw/arch/slic_tw.c
index 6efb1b0..ba0449c 100644
--- a/lynq/R306_MTN/ap/os/linux/linux-3.4.x/drivers/slic_tw/arch/slic_tw.c
+++ b/lynq/R306_MTN/ap/os/linux/linux-3.4.x/drivers/slic_tw/arch/slic_tw.c
@@ -1526,12 +1526,17 @@
#endif
printk("slic_tw_probe\n");
-#ifdef CONFIG_ARCH_ZX297520V3_CPE_SWITCH
+#if defined(CONFIG_ARCH_ZX297520V3_CPE_SWITCH)|| defined(CONFIG_ARCH_ZX297520V3_CPE)
ret = gpio_request_one(SLIC_PWR_CTRL, GPIOF_OUT_INIT_HIGH, "slic_pwr");
if (ret < 0) {
printk(KERN_ERR "slic_tw_probe: slic_pwr in use\n");
return ret;
}
+ ret = gpio_request_one(SLIC_PWR_CTRL_EN, GPIOF_OUT_INIT_HIGH, "slic_pwr_en");
+ if (ret < 0) {
+ printk(KERN_ERR "slic_tw_probe: slic_pwr_en in use\n");
+ return ret;
+ }
#endif
slic_tw = kzalloc(sizeof(*slic_tw), GFP_KERNEL);
if (slic_tw == NULL) {
diff --git a/lynq/R306_MTN/boot/common/src/loader/cpu/m0/start.S b/lynq/R306_MTN/boot/common/src/loader/cpu/m0/start.S
index 848b5a0..ac539aa 100644
--- a/lynq/R306_MTN/boot/common/src/loader/cpu/m0/start.S
+++ b/lynq/R306_MTN/boot/common/src/loader/cpu/m0/start.S
@@ -13,7 +13,7 @@
#if (CONFIG_DL_DISABLE)
.word 0x045A0000 /* DL port: 0x5A->Disable. */
#else
- .word 0x04000000 /* DL port: 0x00->Enable. */
+ .word 0x01000000 /* DL port: 0x00->Enable. */
#endif
.word 0x3537585A /* = string "57XZ" */
.word 0x31563132 /* = string "1V12" */
@@ -149,6 +149,23 @@
.globl _start
_start:
+ ldr r3, =0x0013C800
+ mov r0, #3
+ lsl r2, r0, #28
+ mvn r0, r2
+ ldr r2, [r3, #0x4]
+ and r0, r0, r2
+ str r0, [r3, #0x4]
+ ldr r3, =0x0013D040
+ ldr r0, [r3]
+ ldr r2, =0x0100
+ mvn r2, r2
+ and r0, r0, r2
+ str r0, [r3]
+ ldr r0, [r3, #0x18]
+ ldr r2, =0x0100
+ ORR r0, r0, r2
+ str r0, [r3, #0x18]
#if defined(CFG_ZLOAD)
/* check stage1 state */
diff --git a/lynq/R306_MTN/cp/ps/project/zx297520v3/prj_evb/source/drv/inc/drvs_ref_cfg.h b/lynq/R306_MTN/cp/ps/project/zx297520v3/prj_evb/source/drv/inc/drvs_ref_cfg.h
index aa56e97..699c05a 100644
--- a/lynq/R306_MTN/cp/ps/project/zx297520v3/prj_evb/source/drv/inc/drvs_ref_cfg.h
+++ b/lynq/R306_MTN/cp/ps/project/zx297520v3/prj_evb/source/drv/inc/drvs_ref_cfg.h
@@ -210,7 +210,7 @@
/************************************spicc end*********************************/
/************************************uicc************************************/
-#ifdef CONFIG_ARCH_ZX297520V3_MDL
+#if (defined CONFIG_ARCH_ZX297520V3_MDL) || (defined CONFIG_ARCH_ZX297520V3_CPE)
#define UICC_GPIO ZX29_GPIO_49
#define UICC_GPIO_FUN_GPIO GPIO49_GPIO49
#define UICC_GPIO_EXT_INT GPIO49_EXT_INT2