From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Mon, 30 Nov 2020 03:33:22 +0000 (+0900)
Subject: tizen: amlogic: change a params name to postfix of each board's name
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62995da3a37290f70fc07531c7634d506e528051;p=platform%2Fkernel%2Fu-boot.git

tizen: amlogic: change a params name to postfix of each board's name

Chagne a params.bin name to postfix of each board's name and location
to root directory.
Also changed the kernel directory from each boardname to kvim/odroid.

Change-Id: I0468f0894d7220cc55b64885c8c411f2c5340606
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---

diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig
index 97dc9ca650..a040cdd23a 100644
--- a/configs/khadas-vim3_defconfig
+++ b/configs/khadas-vim3_defconfig
@@ -34,7 +34,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_DEVICE_AND_PART=":1"
-CONFIG_ENV_FAT_FILE="vim3/params.bin"
+CONFIG_ENV_FAT_FILE="params-vim3.bin"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig
index 7e75f187d8..569891d4c7 100644
--- a/configs/khadas-vim3l_defconfig
+++ b/configs/khadas-vim3l_defconfig
@@ -33,7 +33,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_DEVICE_AND_PART=":1"
-CONFIG_ENV_FAT_FILE="vim3l/params.bin"
+CONFIG_ENV_FAT_FILE="params-vim3l.bin"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig
index 2d42a93615..04c4becf13 100644
--- a/configs/odroid-c4_defconfig
+++ b/configs/odroid-c4_defconfig
@@ -29,7 +29,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_DEVICE_AND_PART=":1"
-CONFIG_ENV_FAT_FILE="odroid-c4/params.bin"
+CONFIG_ENV_FAT_FILE="params-c4.bin"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig
index f8940c0584..e1bb200256 100644
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -30,7 +30,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_DEVICE_AND_PART=":1"
-CONFIG_ENV_FAT_FILE="odroid-n2/params.bin"
+CONFIG_ENV_FAT_FILE="params-n2.bin"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DFU_MMC=y
diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h
index da1c8b6ada..be4a4e6b45 100644
--- a/include/samsung/tizen_amlogic.h
+++ b/include/samsung/tizen_amlogic.h
@@ -27,18 +27,12 @@
 	"kvim3l_linux.dtb fat -1 1;"		\
 	"boot.scr.uimg fat -1 1;"		\
 	"params.bin fat -1 1;"			\
-	"vim3/Image.gz fat -1 1;"		\
-	"vim3l/Image.gz fat -1 1;"		\
-	"odroid-n2/Image.gz fat -1 1;"		\
-	"odroid-c4/Image.gz fat -1 1;"		\
-	"vim3/params.bin fat -1 1;"		\
-	"vim3l/params.bin fat -1 1;"		\
-	"odroid-n2/params.bin fat -1 1;"	\
-	"odroid-c4/params.bin fat -1 1;"	\
-	"vim3/boot.scr.uimg fat -1 1;"		\
-	"vim3l/boot.scr.uimg fat -1 1;"		\
-	"odroid-n2/boot.scr.uimg fat -1 1;"	\
-	"odroid-c4/boot.scr.uimg fat -1 1;"	\
+	"params-c4.bin fat -1 1;"		\
+	"params-n2.bin fat -1 1;"		\
+	"params-vim3.bin fat -1 1;"		\
+	"params-vim3l.bin fat -1 1;"		\
+	"kvim/Image.gz fat -1 1;"		\
+	"odroid/Image.gz fat -1 1;"		\
 	"boot.img part -1 1;"			\
 	"rootfs part -1 2;"			\
 	"system-data part -1 3;"		\
@@ -76,22 +70,22 @@
 #endif
 
 #ifdef CONFIG_TIZEN_KHADAS_VIM3
-#define TIZEN_BOOT_PREFIX "/vim3/ /"
+#define TIZEN_BOOT_PREFIX "/kvim/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_VIM3
 #define DEVICE_TREE_NAME	"kvim3_linux.dtb"
 #define BOARD_NAME	"khadas-vim3"
 #elif CONFIG_TIZEN_KHADAS_VIM3L
-#define TIZEN_BOOT_PREFIX "/vim3l/ /"
+#define TIZEN_BOOT_PREFIX "/kvim/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_VIM3L
 #define DEVICE_TREE_NAME	"kvim3l_linux.dtb"
 #define BOARD_NAME	"khadas-vim3l"
 #elif CONFIG_TIZEN_ODROID_N2
-#define TIZEN_BOOT_PREFIX "/odroid-n2/ /"
+#define TIZEN_BOOT_PREFIX "/odroid/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_ODROID_N2
 #define DEVICE_TREE_NAME	"meson64_odroidn2_drm.dtb"
 #define BOARD_NAME	"odrond-n2"
 #elif CONFIG_TIZEN_ODROID_C4
-#define TIZEN_BOOT_PREFIX "/odroid-c4/ /"
+#define TIZEN_BOOT_PREFIX "/odroid/ /"
 #define DFU_ALT_BOOT	DFU_ALT_BOOT_ODROID_C4
 #define DEVICE_TREE_NAME	"meson64_odroidc4.dtb"
 #define BOARD_NAME	"odroid-c4"
diff --git a/packaging/u-boot-c4.spec b/packaging/u-boot-c4.spec
index 269d5e9521..f59b0665b4 100644
--- a/packaging/u-boot-c4.spec
+++ b/packaging/u-boot-c4.spec
@@ -67,7 +67,7 @@ chmod +x ./fip/aml_encrypt_g12a
 cp `find ./env -name "built-in.o"` copy_env_common.o
 objcopy -O binary --only-section=.rodata.default_environment `find . -name "copy_env_common.o"`
 tr '\0' '\n' < copy_env_common.o > default_envs.txt
-mkenvimage -s 16384 -o params.bin default_envs.txt
+mkenvimage -s 16384 -o params-c4.bin default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # 1-7. Build Boot script
@@ -82,7 +82,7 @@ mkdir -p %{buildroot}/boot/odroid-c4
 mkdir -p %{buildroot}/var/tmp/u-boot-amlogic
 install -d %{buildroot}/var/tmp/u-boot-amlogic
 install -m 755 u-boot-c4.bin %{buildroot}/var/tmp/u-boot-amlogic
-install -m 755 params.bin %{buildroot}/boot/odroid-c4
+install -m 755 params-c4.bin %{buildroot}/boot
 install -m 755 boot.scr.uimg.c4 %{buildroot}/boot/
 
 %post
@@ -94,5 +94,5 @@ mv /boot/boot.scr.uimg.c4 /boot/boot.scr.uimg
 %manifest u_boot_amlogic.manifest
 %defattr(-,root,root,-)
 /var/tmp/u-boot-amlogic
-/boot/odroid-c4/params.bin
+/boot/params-c4.bin
 /boot/boot.scr.uimg.c4
diff --git a/packaging/u-boot-kvim3.spec b/packaging/u-boot-kvim3.spec
index 253476d22c..3eb2a30379 100644
--- a/packaging/u-boot-kvim3.spec
+++ b/packaging/u-boot-kvim3.spec
@@ -67,7 +67,7 @@ chmod +x ./fip/aml_encrypt_g12b
 cp `find ./env -name "built-in.o"` copy_env_common.o
 objcopy -O binary --only-section=.rodata.default_environment `find . -name "copy_env_common.o"`
 tr '\0' '\n' < copy_env_common.o > default_envs.txt
-mkenvimage -s 16384 -o params.bin default_envs.txt
+mkenvimage -s 16384 -o params-vim3.bin default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # Build Boot script
@@ -81,7 +81,7 @@ mkdir -p %{buildroot}/boot/vim3
 mkdir -p %{buildroot}/var/tmp/u-boot-amlogic
 install -d %{buildroot}/var/tmp/u-boot-amlogic
 install -m 755 u-boot-kvim3.bin %{buildroot}/var/tmp/u-boot-amlogic
-install -m 755 params.bin %{buildroot}/boot/vim3
+install -m 755 params-vim3.bin %{buildroot}/boot
 install -m 755 boot.scr.uimg.vim3 %{buildroot}/boot
 
 %post
@@ -93,5 +93,5 @@ mv /boot/boot.scr.uimg.vim3 /boot/boot.scr.uimg
 %manifest u_boot_amlogic.manifest
 %defattr(-,root,root,-)
 /var/tmp/u-boot-amlogic
-/boot/vim3/params.bin
+/boot/params-vim3.bin
 /boot/boot.scr.uimg.vim3
diff --git a/packaging/u-boot-kvim3l.spec b/packaging/u-boot-kvim3l.spec
index 5e9c37ee96..723c0dfe79 100644
--- a/packaging/u-boot-kvim3l.spec
+++ b/packaging/u-boot-kvim3l.spec
@@ -67,7 +67,7 @@ chmod +x ./fip/aml_encrypt_g12a
 cp `find ./env -name "built-in.o"` copy_env_common.o
 objcopy -O binary --only-section=.rodata.default_environment `find . -name "copy_env_common.o"`
 tr '\0' '\n' < copy_env_common.o > default_envs.txt
-mkenvimage -s 16384 -o params.bin default_envs.txt
+mkenvimage -s 16384 -o params-vim3l.bin default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # Build Boot script
@@ -81,7 +81,7 @@ mkdir -p %{buildroot}/boot/vim3l
 mkdir -p %{buildroot}/var/tmp/u-boot-amlogic
 install -d %{buildroot}/var/tmp/u-boot-amlogic
 install -m 755 u-boot-kvim3l.bin %{buildroot}/var/tmp/u-boot-amlogic
-install -m 755 params.bin %{buildroot}/boot/vim3l
+install -m 755 params-vim3l.bin %{buildroot}/boot
 install -m 755 boot.scr.uimg.vim3l %{buildroot}/boot
 
 %post
@@ -93,5 +93,5 @@ mv /boot/boot.scr.uimg.vim3l /boot/boot.scr.uimg
 %manifest u_boot_amlogic.manifest
 %defattr(-,root,root,-)
 /var/tmp/u-boot-amlogic
-/boot/vim3l/params.bin
+/boot/params-vim3l.bin
 /boot/boot.scr.uimg.vim3l
diff --git a/packaging/u-boot-n2.spec b/packaging/u-boot-n2.spec
index ffc7439475..20e53c4c28 100644
--- a/packaging/u-boot-n2.spec
+++ b/packaging/u-boot-n2.spec
@@ -67,7 +67,7 @@ chmod +x ./fip/aml_encrypt_g12b
 cp `find ./env -name "built-in.o"` copy_env_common.o
 objcopy -O binary --only-section=.rodata.default_environment `find . -name "copy_env_common.o"`
 tr '\0' '\n' < copy_env_common.o > default_envs.txt
-mkenvimage -s 16384 -o params.bin default_envs.txt
+mkenvimage -s 16384 -o params-n2.bin default_envs.txt
 rm copy_env_common.o default_envs.txt
 
 # 1-7. Build Boot script
@@ -82,7 +82,7 @@ mkdir -p %{buildroot}/boot/odroid-n2
 mkdir -p %{buildroot}/var/tmp/u-boot-amlogic
 install -d %{buildroot}/var/tmp/u-boot-amlogic
 install -m 755 u-boot-n2.bin %{buildroot}/var/tmp/u-boot-amlogic
-install -m 755 params.bin %{buildroot}/boot/odroid-n2
+install -m 755 params-n2.bin %{buildroot}/boot
 install -m 755 boot.scr.uimg.n2 %{buildroot}/boot/
 
 %post
@@ -94,5 +94,5 @@ mv /boot/boot.scr.uimg.n2 /boot/boot.scr.uimg
 %manifest u_boot_amlogic.manifest
 %defattr(-,root,root,-)
 /var/tmp/u-boot-amlogic
-/boot/odroid-n2/params.bin
+/boot/params-n2.bin
 /boot/boot.scr.uimg.n2
diff --git a/tizen/build-kvim3.sh b/tizen/build-kvim3.sh
index 5cde2ff054..3c1eb18deb 100755
--- a/tizen/build-kvim3.sh
+++ b/tizen/build-kvim3.sh
@@ -23,11 +23,10 @@ build_uboot()
 		exit 1;
 	fi
 	if [ -d output ]; then
-		rm output/$BOARD/*
 		rm output/*
 	fi
 
-	[ -d output/$BOARD ] || mkdir -p output/$BOARD
+	[ -d output ] || mkdir -p output
 
 	if ! [ -e .config ] ; then
 		make ARCH=arm64 khadas-${BOARD}_defconfig
@@ -72,10 +71,9 @@ build_vim3()
 		--ddrfw9 fip/kvim3/lpddr3_ld.fw \
 		--level v3
 
-	cp params.bin output/vim3/
-	cp arch/arm/dts/meson-g12b-a311d-khadas-vim3.dtb ./output/
+	cp params.bin output/params-vim3.bin
 	cd ./output/
-	tar cvf kvim3_bootloader.tar u-boot-kvim3.bin boot.scr.uimg vim3/params.bin
+	tar cvf kvim3_bootloader.tar u-boot-kvim3.bin boot.scr.uimg params-vim3.bin
 	cd ..
 }
 
@@ -105,9 +103,9 @@ build_vim3l()
 		--ddrfw9 fip/kvim3l/lpddr3_ld.fw \
 		--level v3
 
-	cp params.bin output/vim3l/
+	cp params.bin output/params-vim3l.bin
 	cd ./output/
-	tar cvf kvim3l_bootloader.tar u-boot-kvim3l.bin boot.scr.uimg vim3l/params.bin
+	tar cvf kvim3l_bootloader.tar u-boot-kvim3l.bin boot.scr.uimg params-vim3l.bin
 	cd ..
 }
 
diff --git a/tizen/build-odroid-c4.sh b/tizen/build-odroid-c4.sh
index 20cc753997..8a01abbc0b 100755
--- a/tizen/build-odroid-c4.sh
+++ b/tizen/build-odroid-c4.sh
@@ -15,11 +15,10 @@ check_ccache()
 build_uboot()
 {
 	if [ -d output ]; then
-		rm output/odroid-c4/*
 		rm output/*
 	fi
 
-	[ -d output/odroid-c4 ] || mkdir -p output/odroid-c4
+	[ -d output ] || mkdir -p output
 
 	if ! [ -e .config ] ; then
 		make ARCH=arm64 odroid-c4_defconfig
@@ -43,8 +42,6 @@ build_amlogic()
 		cp u-boot.bin output/bl33.bin
 	fi
 
-	[ -d output ] || mkdir output
-
 	./fip/aml_encrypt_g12a --bl3sig --input output/bl33.bin --compress lz4 \
 					--output output/bl33.bin.enc \
 					--level v3 --type bl33 --compress lz4
@@ -65,10 +62,9 @@ build_amlogic()
 		--ddrfw8 fip/c4/aml_ddr.fw \
 		--level v3
 
-	cp params.bin output/odroid-c4/
-	cp arch/arm/dts/meson-sm1-odroid-c4.dtb ./output/
+	cp params.bin output/params-c4.bin
 	cd ./output/
-	tar cvf odroidc4_bootloader.tar u-boot-c4.bin boot.scr.uimg odroid-c4/params.bin
+	tar cvf odroidc4_bootloader.tar u-boot-c4.bin boot.scr.uimg params-c4.bin
 	cd ..
 }
 
diff --git a/tizen/build-odroid-n2.sh b/tizen/build-odroid-n2.sh
index 36758dff27..044aed073e 100755
--- a/tizen/build-odroid-n2.sh
+++ b/tizen/build-odroid-n2.sh
@@ -15,11 +15,10 @@ check_ccache()
 build_uboot()
 {
 	if [ -d output ]; then
-		rm output/odroid-n2/*
 		rm output/*
 	fi
 
-	[ -d output/odroid-n2 ] || mkdir -p output/odroid-n2
+	[ -d output ] || mkdir -p output
 
 	if ! [ -e .config ] ; then
 		make ARCH=arm64 odroid-n2_defconfig
@@ -43,8 +42,6 @@ build_amlogic()
 		cp u-boot.bin output/bl33.bin
 	fi
 
-	[ -d output ] || mkdir output
-
 	./fip/aml_encrypt_g12b --bl3sig --input output/bl33.bin --compress lz4 \
 					--output output/bl33.bin.enc \
 					--level v3 --type bl33 --compress lz4
@@ -64,10 +61,9 @@ build_amlogic()
 		--ddrfw8 fip/n2/aml_ddr.fw \
 		--level v3
 
-	cp params.bin output/odroid-n2/
-	cp arch/arm/dts/meson-g12b-odroid-n2.dtb ./output/
+	cp params.bin output/params-n2.bin
 	cd ./output/
-	tar cvf odroidn2_bootloader.tar u-boot-n2.bin boot.scr.uimg odroid-n2/params.bin
+	tar cvf odroidn2_bootloader.tar u-boot-n2.bin boot.scr.uimg params-n2.bin
 	cd ..
 }