From 7836e6ee4d250e2d27318350b2c1a8cc8b046d46 Mon Sep 17 00:00:00 2001
From: Chen Wang <unicorn_wang@outlook.com>
Date: Thu, 26 Dec 2024 14:31:47 +0800
Subject: [PATCH] bsp: cvitek: update combine.sh for arm64

Move the combine.sh to under cv18xx_aarch64, so we can
run this script the same as scons and no need to change
cwd.

Rename the folder boot to prebuild just becuase all the
files under boot are prebuild binaries.
Move the prebuilt fip.bin to under prebuild/milkv-duo256m
because it's only for 256.

Update combine.sh accordingly and output fip.bin to the output
folder where we create fip.bin/boot.sd as other bsp.

Signed-off-by: Chen Wang <unicorn_wang@outlook.com>
---
 bsp/cvitek/cv18xx_aarch64/{boot => }/combine.sh     |  10 +++++++---
 .../{boot => prebuild}/milkv-duo256m/bl2.bin        | Bin
 .../{boot => prebuild}/milkv-duo256m/bl31.bin       | Bin
 .../{boot => prebuild}/milkv-duo256m/blmacros.env   |   0
 .../{boot => prebuild}/milkv-duo256m/chip_conf.bin  | Bin
 .../{boot => prebuild}/milkv-duo256m/ddr_param.bin  | Bin
 .../{boot => prebuild}/milkv-duo256m/empty.bin      |   0
 .../{boot => prebuild/milkv-duo256m}/fip.bin        | Bin
 .../{boot => prebuild}/milkv-duo256m/fiptool.py     |   0
 .../{boot => prebuild}/milkv-duo256m/u-boot-raw.bin | Bin
 10 files changed, 7 insertions(+), 3 deletions(-)
 rename bsp/cvitek/cv18xx_aarch64/{boot => }/combine.sh (88%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/bl2.bin (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/bl31.bin (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/blmacros.env (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/chip_conf.bin (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/ddr_param.bin (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/empty.bin (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild/milkv-duo256m}/fip.bin (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/fiptool.py (100%)
 rename bsp/cvitek/cv18xx_aarch64/{boot => prebuild}/milkv-duo256m/u-boot-raw.bin (100%)

diff --git a/bsp/cvitek/cv18xx_aarch64/boot/combine.sh b/bsp/cvitek/cv18xx_aarch64/combine.sh
similarity index 88%
rename from bsp/cvitek/cv18xx_aarch64/boot/combine.sh
rename to bsp/cvitek/cv18xx_aarch64/combine.sh
index e39f49dcbc..af53969004 100755
--- a/bsp/cvitek/cv18xx_aarch64/boot/combine.sh
+++ b/bsp/cvitek/cv18xx_aarch64/combine.sh
@@ -1,6 +1,7 @@
-C906_LITTLE_BIN_PATH=../../c906_little/rtthread.bin
-GEN_FIP_PATH=.
-DEPENDS_FILE_PATH=${GEN_FIP_PATH}/milkv-duo256m
+#!/bin/bash
+C906_LITTLE_BIN_PATH=../c906_little/rtthread.bin
+GEN_FIP_PATH=../output/milkv-duo256m/
+DEPENDS_FILE_PATH=./prebuild/milkv-duo256m
 
 BLCP_IMG_RUNADDR=0x05200200
 BLCP_PARAM_LOADADDR=0
@@ -20,8 +21,11 @@ if [ -f "$C906_LITTLE_BIN_PATH" ]; then
     BLCP_2ND_PATH=${C906_LITTLE_BIN_PATH}
 else
     echo "The file $C906_LITTLE_BIN_PATH does not exist. Execute scons to compile it."
+    exit
 fi
 
+mkdir -p $GEN_FIP_PATH
+
 echo "Combining fip.bin..."
 . ${DEPENDS_FILE_PATH}/blmacros.env && \
 ${DEPENDS_FILE_PATH}/fiptool.py -v genfip \
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/bl2.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/bl2.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/bl2.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/bl2.bin
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/bl31.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/bl31.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/bl31.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/bl31.bin
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/blmacros.env b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/blmacros.env
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/blmacros.env
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/blmacros.env
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/chip_conf.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/chip_conf.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/chip_conf.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/chip_conf.bin
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/ddr_param.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/ddr_param.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/ddr_param.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/ddr_param.bin
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/empty.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/empty.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/empty.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/empty.bin
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/fip.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/fip.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/fip.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/fip.bin
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/fiptool.py b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/fiptool.py
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/fiptool.py
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/fiptool.py
diff --git a/bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/u-boot-raw.bin b/bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/u-boot-raw.bin
similarity index 100%
rename from bsp/cvitek/cv18xx_aarch64/boot/milkv-duo256m/u-boot-raw.bin
rename to bsp/cvitek/cv18xx_aarch64/prebuild/milkv-duo256m/u-boot-raw.bin