commit 0c41a3e2527f133c1bc7be7e2ae4eeb6fe07ccfb
Author: zyw <zyw@rock-chips.com>
Date:   Wed Apr 24 21:39:32 2013 +0800

    move Tools to tools/rk_tools

diff --git a/BootMerger.exe b/BootMerger.exe
new file mode 100644
index 00000000..98def2b2
Binary files /dev/null and b/BootMerger.exe differ
diff --git a/Language/Chinese.ini b/Language/Chinese.ini
new file mode 100644
index 00000000..a5413fc3
Binary files /dev/null and b/Language/Chinese.ini differ
diff --git a/Language/English.ini b/Language/English.ini
new file mode 100644
index 00000000..5f09fd2a
Binary files /dev/null and b/Language/English.ini differ
diff --git a/RKBOOT.ini b/RKBOOT.ini
new file mode 100644
index 00000000..1f3bf5e9
--- /dev/null
+++ b/RKBOOT.ini
@@ -0,0 +1,7 @@
+/***************************************
+* 请为打包工具指定芯片类型
+* 支持的芯片类型：
+* RK27|RK28|RK281X|RKCROWN|RKNANO|RKCAYMAN|RK29|RK30|RK30B|RK31|RK32|RK292X|RKPANDA|RKSMART SDBOOT
+***************************************/
+[CHIP_SELECT]
+CHIP=RK30
\ No newline at end of file
diff --git a/RKBOOT/RK27.ini b/RKBOOT/RK27.ini
new file mode 100644
index 00000000..b639118a
--- /dev/null
+++ b/RKBOOT/RK27.ini
@@ -0,0 +1,11 @@
+[CHIP_NAME]
+NAME=RK27
+[VERSION]
+MAJOR=1
+MINOR=0
+[LOADER_OPTION]
+LOADERCOUNT=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+[OUTPUT]
+NAME=RK27Boot.bin
\ No newline at end of file
diff --git a/RKBOOT/RK28.ini b/RKBOOT/RK28.ini
new file mode 100644
index 00000000..400fb09a
--- /dev/null
+++ b/RKBOOT/RK28.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK28
+[VERSION]
+MAJOR=1
+MINOR=17
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=1
+Path1=
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=
+FlashBoot=
+[OUTPUT]
+PATH=
diff --git a/RKBOOT/RK281X.ini b/RKBOOT/RK281X.ini
new file mode 100644
index 00000000..06a655d5
--- /dev/null
+++ b/RKBOOT/RK281X.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK281X
+[VERSION]
+MAJOR=2
+MINOR=20
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=1
+Path1=
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=
+FlashBoot=
+[OUTPUT]
+PATH=
diff --git a/RKBOOT/RK29.ini b/RKBOOT/RK29.ini
new file mode 100644
index 00000000..70d4763e
--- /dev/null
+++ b/RKBOOT/RK29.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK29
+[VERSION]
+MAJOR=2
+MINOR=39
+[CODE471_OPTION]
+NUM=1
+Path1=RK29XX_DDR_USB_V2.06.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk29usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=RK29XX_DDR_NAND_V2.06.bin
+FlashBoot=rk29linuxLoader.bin
+[OUTPUT]
+PATH=RK29xxLoader(L)_V2.33_debug.bin
diff --git a/RKBOOT/RK290X.ini b/RKBOOT/RK290X.ini
new file mode 100644
index 00000000..e69de29b
diff --git a/RKBOOT/RK292X.ini b/RKBOOT/RK292X.ini
new file mode 100644
index 00000000..f458fafe
--- /dev/null
+++ b/RKBOOT/RK292X.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK292X
+[VERSION]
+MAJOR=1
+MINOR=100
+[CODE471_OPTION]
+NUM=1
+Path1=2928_DDR3_NEW_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk2928usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=2928_DDR3_NEW_300MHz.bin
+FlashBoot=rk2928linuxLoader.bin
+[OUTPUT]
+PATH=RK292xLoader(L)_V1.20_debug.bin
diff --git a/RKBOOT/RK292XFT.ini b/RKBOOT/RK292XFT.ini
new file mode 100644
index 00000000..67f1c77d
--- /dev/null
+++ b/RKBOOT/RK292XFT.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK292X
+[VERSION]
+MAJOR=1
+MINOR=10
+[CODE471_OPTION]
+NUM=1
+Path1=2928_DDR3_NEW_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk2928usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=2928_DDR3_NEW_300MHz.bin
+FlashBoot=rk2928linuxLoader_ft.bin
+[OUTPUT]
+PATH=RK292xLoader(L)_V1.09_FT.bin
diff --git a/RKBOOT/RK292XO.ini b/RKBOOT/RK292XO.ini
new file mode 100644
index 00000000..5be40648
--- /dev/null
+++ b/RKBOOT/RK292XO.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK292X
+[VERSION]
+MAJOR=1
+MINOR=10
+[CODE471_OPTION]
+NUM=1
+Path1=2928_DDR3_OLD_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk2928usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=2928_DDR3_OLD_300MHz.bin
+FlashBoot=rk2928linuxLoader_ft.bin
+[OUTPUT]
+PATH=RK292xLoader(L)_V1.09_oldchip_FT.bin
diff --git a/RKBOOT/RK292XUSB.ini b/RKBOOT/RK292XUSB.ini
new file mode 100644
index 00000000..c8f7b634
--- /dev/null
+++ b/RKBOOT/RK292XUSB.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK292X
+[VERSION]
+MAJOR=1
+MINOR=1
+[CODE471_OPTION]
+NUM=1
+Path1=2928_DDR3_20120906.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk2928usbplug_nousb.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=2928_DDR3_20120906.bin
+FlashBoot=rk2928linuxLoader_nousb.bin
+[OUTPUT]
+PATH=RK292xLoader(L)_V1.00_no_config_usb.bin
diff --git a/RKBOOT/RK29DDR3.ini b/RKBOOT/RK29DDR3.ini
new file mode 100644
index 00000000..0a51ec84
--- /dev/null
+++ b/RKBOOT/RK29DDR3.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK29
+[VERSION]
+MAJOR=2
+MINOR=31
+[CODE471_OPTION]
+NUM=1
+Path1=RK29XX_DDR400MHz_USB_20120914.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk29usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=RK29XX_DDR400MHz_NAND_20120914.bin
+FlashBoot=rk29linuxLoader.bin
+[OUTPUT]
+PATH=RK29xxLoader(L)_DDR3_400Mhz_V2.30.bin
diff --git a/RKBOOT/RK29PE.ini b/RKBOOT/RK29PE.ini
new file mode 100644
index 00000000..e69de29b
diff --git a/RKBOOT/RK29XX.ini b/RKBOOT/RK29XX.ini
new file mode 100644
index 00000000..e69de29b
diff --git a/RKBOOT/RK30.ini b/RKBOOT/RK30.ini
new file mode 100755
index 00000000..41d28dd6
--- /dev/null
+++ b/RKBOOT/RK30.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30
+[VERSION]
+MAJOR=1
+MINOR=38
+[CODE471_OPTION]
+NUM=1
+Path1=30_LPDDR2_300MHz_DDR3_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=30_LPDDR2_300MHz_DDR3_300MHz.bin
+FlashBoot=..\u-boot.bin
+[OUTPUT]
+PATH=..\RK30xxLoader_uboot.bin
diff --git a/RKBOOT/RK30B - 鍓湰.ini b/RKBOOT/RK30B - 鍓湰.ini
new file mode 100644
index 00000000..468c210a
--- /dev/null
+++ b/RKBOOT/RK30B - 鍓湰.ini	
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30B
+[VERSION]
+MAJOR=1
+MINOR=8
+[CODE471_OPTION]
+NUM=1
+Path1=3168_LPDDR2_300MHz_DDR3_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=3168_LPDDR2_300MHz_DDR3_300MHz.bin
+FlashBoot=rk30linuxLoader.bin
+[OUTPUT]
+PATH=RK3168_Loader(L)_V1.05.bin
diff --git a/RKBOOT/RK30B.ini b/RKBOOT/RK30B.ini
new file mode 100644
index 00000000..5fc51c0d
--- /dev/null
+++ b/RKBOOT/RK30B.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30B
+[VERSION]
+MAJOR=1
+MINOR=9
+[CODE471_OPTION]
+NUM=1
+Path1=3168_LPDDR2_300MHz_DDR3_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=3168_LPDDR2_300MHz_DDR3_300MHz.bin
+FlashBoot=rk30linuxLoader.bin
+[OUTPUT]
+PATH=RK3168_Loader(L)_V1.05.bin
diff --git a/RKBOOT/RK30B_TEST.ini b/RKBOOT/RK30B_TEST.ini
new file mode 100644
index 00000000..b65daccc
--- /dev/null
+++ b/RKBOOT/RK30B_TEST.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30B
+[VERSION]
+MAJOR=1
+MINOR=99
+[CODE471_OPTION]
+NUM=1
+Path1=Load1_20120917_testreg2=2.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=Load1_20120917_testreg2=2.bin
+FlashBoot=rk30linuxLoader_nopll.bin
+[OUTPUT]
+PATH=RK30BxxLoader(L)_V1.99_TEST_2.bin
diff --git a/RKBOOT/RK30FT.ini b/RKBOOT/RK30FT.ini
new file mode 100644
index 00000000..7bd62455
--- /dev/null
+++ b/RKBOOT/RK30FT.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30
+[VERSION]
+MAJOR=1
+MINOR=19
+[CODE471_OPTION]
+NUM=1
+Path1=30_LPDDR2_300MHz_DDR3_300MHz_20120529.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=30_LPDDR2_300MHz_DDR3_300MHz_20120529.bin
+FlashBoot=rk30linuxLoader_ft.bin
+[OUTPUT]
+PATH=RK30xxLoader(L)_ft.bin
diff --git a/RKBOOT/RK30PE.ini b/RKBOOT/RK30PE.ini
new file mode 100644
index 00000000..228af49c
--- /dev/null
+++ b/RKBOOT/RK30PE.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30
+[VERSION]
+MAJOR=1
+MINOR=30
+[CODE471_OPTION]
+NUM=1
+Path1=30_LPDDR2_300MHz_DDR3_300MHz_20120420.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30PeTest.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=30_LPDDR2_300MHz_DDR3_300MHz_20120420.bin
+FlashBoot=rk30PeTest.bin
+[OUTPUT]
+PATH=RK30FlashTestPE_DOWN_IN_RAM_20120718.bin
diff --git a/RKBOOT/RK30PE2.ini b/RKBOOT/RK30PE2.ini
new file mode 100644
index 00000000..d8c78e6f
--- /dev/null
+++ b/RKBOOT/RK30PE2.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30
+[VERSION]
+MAJOR=1
+MINOR=20
+[CODE471_OPTION]
+NUM=1
+Path1=30_LPDDR2_300MHz_DDR3_300MHz_20120420.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=30_LPDDR2_300MHz_DDR3_300MHz_20120420.bin
+FlashBoot=rk30PeTest.bin
+[OUTPUT]
+PATH=RK30FlashTest_IN_FLASH_20120630.bin
diff --git a/RKBOOT/RK31.ini b/RKBOOT/RK31.ini
new file mode 100644
index 00000000..924d3ac8
--- /dev/null
+++ b/RKBOOT/RK31.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK31
+[VERSION]
+MAJOR=2
+MINOR=5
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=1
+Path1=
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=
+FlashBoot=
+[OUTPUT]
+PATH=
diff --git a/RKBOOT/RK3168.ini b/RKBOOT/RK3168.ini
new file mode 100644
index 00000000..eca0174c
--- /dev/null
+++ b/RKBOOT/RK3168.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30B
+[VERSION]
+MAJOR=1
+MINOR=13
+[CODE471_OPTION]
+NUM=1
+Path1=3168_LPDDR2_300MHz_DDR3_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=3168_LPDDR2_300MHz_DDR3_300MHz.bin
+FlashBoot=rk30linuxLoader.bin
+[OUTPUT]
+PATH=RK3168Loader(L)_V1.07_debug.bin
diff --git a/RKBOOT/RK3188.ini b/RKBOOT/RK3188.ini
new file mode 100644
index 00000000..45ee2e1f
--- /dev/null
+++ b/RKBOOT/RK3188.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK30
+[VERSION]
+MAJOR=1
+MINOR=13
+[CODE471_OPTION]
+NUM=1
+Path1=3188_LPDDR2_300MHz_DDR3_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk30usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=3188_LPDDR2_300MHz_DDR3_300MHz.bin
+FlashBoot=rk30linuxLoader.bin
+[OUTPUT]
+PATH=RK3188Loader(L)_V1.03_debug.bin
diff --git a/RKBOOT/RK32.ini b/RKBOOT/RK32.ini
new file mode 100644
index 00000000..44a3b3c6
--- /dev/null
+++ b/RKBOOT/RK32.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK32
+[VERSION]
+MAJOR=2
+MINOR=5
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=1
+Path1=
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=
+FlashBoot=
+[OUTPUT]
+PATH=
diff --git a/RKBOOT/RKCAYMAN.ini b/RKBOOT/RKCAYMAN.ini
new file mode 100644
index 00000000..b09d58c7
--- /dev/null
+++ b/RKBOOT/RKCAYMAN.ini
@@ -0,0 +1,20 @@
+[CHIP_NAME]
+NAME=RKCAYMAN
+[VERSION]
+MAJOR=4
+MINOR=48
+[CODE471_OPTION]
+NUM=1
+Path1=RK28XX_SDRAM_DDR_USB.bin
+Sleep=2000
+[CODE472_OPTION]
+NUM=1
+Path1=RK28xxUsbPlus.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=RK2738_SDRAM_NAND.bin
+FlashBoot=rk2738spiloader.bin
+[OUTPUT]
+PATH=RK2738SPIBoot.bin
diff --git a/RKBOOT/RKCROWN.ini b/RKBOOT/RKCROWN.ini
new file mode 100644
index 00000000..f5ce2ec2
--- /dev/null
+++ b/RKBOOT/RKCROWN.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RKCROWN
+[VERSION]
+MAJOR=1
+MINOR=1
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=1
+Path1=
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=
+FlashBoot=
+[OUTPUT]
+PATH=
diff --git a/RKBOOT/RKNANO.ini b/RKBOOT/RKNANO.ini
new file mode 100644
index 00000000..78034499
--- /dev/null
+++ b/RKBOOT/RKNANO.ini
@@ -0,0 +1,18 @@
+[CHIP_NAME]
+NAME=RKNANO
+[VERSION]
+MAJOR=1
+MINOR=0
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=0
+[LOADER_OPTION]
+NUM=2
+LOADER1=NandBoot1
+LOADER2=NandBoot2
+NandBoot1=
+NandBoot2=
+[OUTPUT]
+PATH=
\ No newline at end of file
diff --git a/RKBOOT/RKPANDA.ini b/RKBOOT/RKPANDA.ini
new file mode 100644
index 00000000..e86f13ba
--- /dev/null
+++ b/RKBOOT/RKPANDA.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RKPANDA
+[VERSION]
+MAJOR=1
+MINOR=17
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=1
+Path1=
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=
+FlashBoot=
+[OUTPUT]
+PATH=
diff --git a/RKBOOT/RKSMART.ini b/RKBOOT/RKSMART.ini
new file mode 100644
index 00000000..008f086f
--- /dev/null
+++ b/RKBOOT/RKSMART.ini
@@ -0,0 +1,18 @@
+[CHIP_NAME]
+NAME=RKSMART
+[VERSION]
+MAJOR=1
+MINOR=0
+[CODE471_OPTION]
+NUM=1
+Path1=
+[CODE472_OPTION]
+NUM=0
+[LOADER_OPTION]
+NUM=2
+LOADER1=NandBoot1
+LOADER2=NandBoot2
+NandBoot1=
+NandBoot2=
+[OUTPUT]
+PATH=
\ No newline at end of file
diff --git a/RKBOOT/SDBOOT.ini b/RKBOOT/SDBOOT.ini
new file mode 100644
index 00000000..bd2b3078
--- /dev/null
+++ b/RKBOOT/SDBOOT.ini
@@ -0,0 +1,19 @@
+[CHIP_NAME]
+NAME=RK292X
+[VERSION]
+MAJOR=1
+MINOR=6
+[CODE471_OPTION]
+NUM=1
+Path1=2928_DDR3_NEW_300MHz.bin
+[CODE472_OPTION]
+NUM=1
+Path1=rk2928usbplug.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=2928_DDR3_NEW_300MHz.bin
+FlashBoot=rksdboot.bin
+[OUTPUT]
+PATH=SDBoot.bin
diff --git a/config.ini b/config.ini
new file mode 100644
index 00000000..24130f9b
Binary files /dev/null and b/config.ini differ