From cd1f25455b3c4e8abc1c3e5f395c41aaa28b97a8 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Thu, 1 Nov 2018 17:25:47 +0800
Subject: [PATCH] rk1808: move bin to "bin/rk1x/" path

Change-Id: If33d6114a11650a12b325c087582a81a99c6a18e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
---
 RKBOOT/RK1808MINIALL.ini                       |   8 ++++----
 RKTRUST/RK1808TRUST.ini                        |   4 ++--
 bin/{rk18 => rk1x}/rk1808_bl31_v1.00.elf       | Bin
 bin/{rk18 => rk1x}/rk1808_bl32_v1.00.bin       | Bin
 bin/{rk33 => rk1x}/rk1808_ddr_786MHz_v1.00.bin | Bin
 bin/{rk33 => rk1x}/rk1808_ddr_933MHz_v1.00.bin | Bin
 bin/{rk33 => rk1x}/rk1808_miniloader_v1.00.bin | Bin
 bin/{rk33 => rk1x}/rk1808_usbplug_v1.00.bin    | Bin
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename bin/{rk18 => rk1x}/rk1808_bl31_v1.00.elf (100%)
 rename bin/{rk18 => rk1x}/rk1808_bl32_v1.00.bin (100%)
 rename bin/{rk33 => rk1x}/rk1808_ddr_786MHz_v1.00.bin (100%)
 rename bin/{rk33 => rk1x}/rk1808_ddr_933MHz_v1.00.bin (100%)
 rename bin/{rk33 => rk1x}/rk1808_miniloader_v1.00.bin (100%)
 rename bin/{rk33 => rk1x}/rk1808_usbplug_v1.00.bin (100%)

diff --git a/RKBOOT/RK1808MINIALL.ini b/RKBOOT/RK1808MINIALL.ini
index 8be73a11..d463ebe1 100644
--- a/RKBOOT/RK1808MINIALL.ini
+++ b/RKBOOT/RK1808MINIALL.ini
@@ -5,16 +5,16 @@ MAJOR=1
 MINOR=0
 [CODE471_OPTION]
 NUM=1
-Path1=bin/rk33/rk1808_ddr_786MHz_v1.00.bin
+Path1=bin/rk1x/rk1808_ddr_786MHz_v1.00.bin
 Sleep=1
 [CODE472_OPTION]
 NUM=1
-Path1=bin/rk33/rk1808_usbplug_v1.00.bin
+Path1=bin/rk1x/rk1808_usbplug_v1.00.bin
 [LOADER_OPTION]
 NUM=2
 LOADER1=FlashData
 LOADER2=FlashBoot
-FlashData=bin/rk33/rk1808_ddr_786MHz_v1.00.bin
-FlashBoot=bin/rk33/rk1808_miniloader_v1.00.bin
+FlashData=bin/rk1x/rk1808_ddr_786MHz_v1.00.bin
+FlashBoot=bin/rk1x/rk1808_miniloader_v1.00.bin
 [OUTPUT]
 PATH=rk1808_loader_v1.0.100.bin
diff --git a/RKTRUST/RK1808TRUST.ini b/RKTRUST/RK1808TRUST.ini
index 5aa80783..dc64e1a4 100644
--- a/RKTRUST/RK1808TRUST.ini
+++ b/RKTRUST/RK1808TRUST.ini
@@ -5,11 +5,11 @@ MINOR=0
 SEC=0
 [BL31_OPTION]
 SEC=1
-PATH=bin/rk18/rk1808_bl31_v1.00.elf
+PATH=bin/rk1x/rk1808_bl31_v1.00.elf
 ADDR=0x00010000
 [BL32_OPTION]
 SEC=0
-PATH=bin/rk18/rk1808_bl32_v1.00.bin
+PATH=bin/rk1x/rk1808_bl32_v1.00.bin
 ADDR=0x00200000
 [BL33_OPTION]
 SEC=0
diff --git a/bin/rk18/rk1808_bl31_v1.00.elf b/bin/rk1x/rk1808_bl31_v1.00.elf
similarity index 100%
rename from bin/rk18/rk1808_bl31_v1.00.elf
rename to bin/rk1x/rk1808_bl31_v1.00.elf
diff --git a/bin/rk18/rk1808_bl32_v1.00.bin b/bin/rk1x/rk1808_bl32_v1.00.bin
similarity index 100%
rename from bin/rk18/rk1808_bl32_v1.00.bin
rename to bin/rk1x/rk1808_bl32_v1.00.bin
diff --git a/bin/rk33/rk1808_ddr_786MHz_v1.00.bin b/bin/rk1x/rk1808_ddr_786MHz_v1.00.bin
similarity index 100%
rename from bin/rk33/rk1808_ddr_786MHz_v1.00.bin
rename to bin/rk1x/rk1808_ddr_786MHz_v1.00.bin
diff --git a/bin/rk33/rk1808_ddr_933MHz_v1.00.bin b/bin/rk1x/rk1808_ddr_933MHz_v1.00.bin
similarity index 100%
rename from bin/rk33/rk1808_ddr_933MHz_v1.00.bin
rename to bin/rk1x/rk1808_ddr_933MHz_v1.00.bin
diff --git a/bin/rk33/rk1808_miniloader_v1.00.bin b/bin/rk1x/rk1808_miniloader_v1.00.bin
similarity index 100%
rename from bin/rk33/rk1808_miniloader_v1.00.bin
rename to bin/rk1x/rk1808_miniloader_v1.00.bin
diff --git a/bin/rk33/rk1808_usbplug_v1.00.bin b/bin/rk1x/rk1808_usbplug_v1.00.bin
similarity index 100%
rename from bin/rk33/rk1808_usbplug_v1.00.bin
rename to bin/rk1x/rk1808_usbplug_v1.00.bin