From e0944948eed49780b0959fdbaba5d2fae89bbb31 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Thu, 18 Apr 2019 15:17:20 +0800
Subject: [PATCH] npu: lion: add RKBOOT and TRUST support

Change-Id: I727d60807b4b2af94ee28ebeb562f7f2f97e8cb7
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
---
 RKBOOT/RK3399PRONPUMINIALL.ini                |  20 ------------------
 RKBOOT/RKNPULIONMINIALL.ini                   |  20 ++++++++++++++++++
 ...3399PRONPUTRUST.ini => RKNPULIONTRUST.ini} |   4 ++--
 ...31_v1.04.elf => rknpu_lion_bl31_v1.04.elf} | Bin
 ...32_v1.10.bin => rknpu_lion_bl32_v1.10.bin} | Bin
 ...02.bin => rknpu_lion_ddr_333MHz_v1.02.bin} | Bin
 ...02.bin => rknpu_lion_ddr_786MHz_v1.02.bin} | Bin
 ...02.bin => rknpu_lion_ddr_933MHz_v1.02.bin} | Bin
 ...in => rknpu_lion_miniloader_usb_v1.02.bin} | Bin
 9 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100755 RKBOOT/RK3399PRONPUMINIALL.ini
 create mode 100755 RKBOOT/RKNPULIONMINIALL.ini
 rename RKTRUST/{RK3399PRONPUTRUST.ini => RKNPULIONTRUST.ini} (65%)
 rename bin/rk33/{rk3399pro_npu_bl31_v1.04.elf => rknpu_lion_bl31_v1.04.elf} (100%)
 rename bin/rk33/{rk3399pro_npu_bl32_v1.10.bin => rknpu_lion_bl32_v1.10.bin} (100%)
 rename bin/rk33/{rk3399pro_npu_ddr_333MHz_v1.02.bin => rknpu_lion_ddr_333MHz_v1.02.bin} (100%)
 rename bin/rk33/{rk3399pro_npu_ddr_786MHz_v1.02.bin => rknpu_lion_ddr_786MHz_v1.02.bin} (100%)
 rename bin/rk33/{rk3399pro_npu_ddr_933MHz_v1.02.bin => rknpu_lion_ddr_933MHz_v1.02.bin} (100%)
 rename bin/rk33/{rk3399pro_npu_miniloader_usb_v1.02.bin => rknpu_lion_miniloader_usb_v1.02.bin} (100%)

diff --git a/RKBOOT/RK3399PRONPUMINIALL.ini b/RKBOOT/RK3399PRONPUMINIALL.ini
deleted file mode 100755
index 388ae176..00000000
--- a/RKBOOT/RK3399PRONPUMINIALL.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[CHIP_NAME]
-NAME=RK180A
-[VERSION]
-MAJOR=1
-MINOR=2
-[CODE471_OPTION]
-NUM=1
-Path1=bin/rk33/rk3399pro_npu_ddr_933MHz_v1.02.bin
-Sleep=1
-[CODE472_OPTION]
-NUM=1
-Path1=bin/rk33/rk3399pro_npu_miniloader_usb_v1.02.bin
-[LOADER_OPTION]
-NUM=2
-LOADER1=FlashData
-LOADER2=FlashBoot
-FlashData=bin/rk33/rk3399pro_npu_ddr_933MHz_v1.02.bin
-FlashBoot=bin/rk33/rk3399pro_npu_miniloader_usb_v1.02.bin
-[OUTPUT]
-PATH=rk3399pro_npu_loader_v1.02.102.bin
diff --git a/RKBOOT/RKNPULIONMINIALL.ini b/RKBOOT/RKNPULIONMINIALL.ini
new file mode 100755
index 00000000..bacba2e9
--- /dev/null
+++ b/RKBOOT/RKNPULIONMINIALL.ini
@@ -0,0 +1,20 @@
+[CHIP_NAME]
+NAME=RK180A
+[VERSION]
+MAJOR=1
+MINOR=2
+[CODE471_OPTION]
+NUM=1
+Path1=bin/rk33/rknpu_lion_ddr_933MHz_v1.02.bin
+Sleep=1
+[CODE472_OPTION]
+NUM=1
+Path1=bin/rk33/rknpu_lion_miniloader_usb_v1.02.bin
+[LOADER_OPTION]
+NUM=2
+LOADER1=FlashData
+LOADER2=FlashBoot
+FlashData=bin/rk33/rknpu_lion_ddr_933MHz_v1.02.bin
+FlashBoot=bin/rk33/rknpu_lion_miniloader_usb_v1.02.bin
+[OUTPUT]
+PATH=rknpu_lion_loader_v1.02.102.bin
diff --git a/RKTRUST/RK3399PRONPUTRUST.ini b/RKTRUST/RKNPULIONTRUST.ini
similarity index 65%
rename from RKTRUST/RK3399PRONPUTRUST.ini
rename to RKTRUST/RKNPULIONTRUST.ini
index 3cb90979..7fdefcd1 100644
--- a/RKTRUST/RK3399PRONPUTRUST.ini
+++ b/RKTRUST/RKNPULIONTRUST.ini
@@ -5,11 +5,11 @@ MINOR=0
 SEC=0
 [BL31_OPTION]
 SEC=1
-PATH=bin/rk33/rk3399pro_npu_bl31_v1.04.elf
+PATH=bin/rk33/rknpu_lion_bl31_v1.04.elf
 ADDR=0x00010000
 [BL32_OPTION]
 SEC=0
-PATH=bin/rk33/rk3399pro_npu_bl32_v1.10.bin
+PATH=bin/rk33/rknpu_lion_bl32_v1.10.bin
 ADDR=0x00200000
 [BL33_OPTION]
 SEC=0
diff --git a/bin/rk33/rk3399pro_npu_bl31_v1.04.elf b/bin/rk33/rknpu_lion_bl31_v1.04.elf
similarity index 100%
rename from bin/rk33/rk3399pro_npu_bl31_v1.04.elf
rename to bin/rk33/rknpu_lion_bl31_v1.04.elf
diff --git a/bin/rk33/rk3399pro_npu_bl32_v1.10.bin b/bin/rk33/rknpu_lion_bl32_v1.10.bin
similarity index 100%
rename from bin/rk33/rk3399pro_npu_bl32_v1.10.bin
rename to bin/rk33/rknpu_lion_bl32_v1.10.bin
diff --git a/bin/rk33/rk3399pro_npu_ddr_333MHz_v1.02.bin b/bin/rk33/rknpu_lion_ddr_333MHz_v1.02.bin
similarity index 100%
rename from bin/rk33/rk3399pro_npu_ddr_333MHz_v1.02.bin
rename to bin/rk33/rknpu_lion_ddr_333MHz_v1.02.bin
diff --git a/bin/rk33/rk3399pro_npu_ddr_786MHz_v1.02.bin b/bin/rk33/rknpu_lion_ddr_786MHz_v1.02.bin
similarity index 100%
rename from bin/rk33/rk3399pro_npu_ddr_786MHz_v1.02.bin
rename to bin/rk33/rknpu_lion_ddr_786MHz_v1.02.bin
diff --git a/bin/rk33/rk3399pro_npu_ddr_933MHz_v1.02.bin b/bin/rk33/rknpu_lion_ddr_933MHz_v1.02.bin
similarity index 100%
rename from bin/rk33/rk3399pro_npu_ddr_933MHz_v1.02.bin
rename to bin/rk33/rknpu_lion_ddr_933MHz_v1.02.bin
diff --git a/bin/rk33/rk3399pro_npu_miniloader_usb_v1.02.bin b/bin/rk33/rknpu_lion_miniloader_usb_v1.02.bin
similarity index 100%
rename from bin/rk33/rk3399pro_npu_miniloader_usb_v1.02.bin
rename to bin/rk33/rknpu_lion_miniloader_usb_v1.02.bin