tizen: sanitize file names for VIM3(l) boards

Use only the board name (vim3/vim3l) in file names (i.e. u-boot-vim3.bin)
like it is done for odroid boards (i.e. u-boot-c4.bin).

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ia8e4cca3bc96cd1408b75c2bae4d2a29ccd41160

diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h
index be4a4e6b4563c338ad45fb13149845d3b09b3bc9..38d9ec1c9f105051eee37d69d34e230c6e28b5ce 100644 (file)
--- a/include/samsung/tizen_amlogic.h
+++ b/include/samsung/tizen_amlogic.h
@@ -44,21 +44,21 @@
 #define DFU_ALT_BOOT_ODROID_N2 "u-boot.bin raw 0x1 0x1000;"    \
                                "u-boot-n2.bin raw 0x1 0x1000;" \
                                "u-boot-c4.bin skip 0 0;"       \
-                               "u-boot-kvim3l.bin skip 0 0;"   \
-                               "u-boot-kvim3.bin skip 0 0"
+                               "u-boot-vim3l.bin skip 0 0;"    \
+                               "u-boot-vim3.bin skip 0 0"
 #define DFU_ALT_BOOT_VIM3      "u-boot.bin raw 0x1 0x1000;"    \
-                               "u-boot-kvim3.bin raw 0x1 0x1000;" \
+                               "u-boot-vim3.bin raw 0x1 0x1000;" \
                                "u-boot-c4.bin skip 0 0;"       \
-                               "u-boot-kvim3l.bin skip 0 0;"   \
+                               "u-boot-vim3l.bin skip 0 0;"    \
                                "u-boot-n2.bin skip 0 0"
 #define DFU_ALT_BOOT_ODROID_C4 "u-boot.bin raw 0x1 0x1000;"    \
                                "u-boot-c4.bin raw 0x1 0x1000;" \
-                               "u-boot-kvim3.bin skip 0 0;"    \
-                               "u-boot-kvim3l.bin skip 0 0;"   \
+                               "u-boot-vim3.bin skip 0 0;"     \
+                               "u-boot-vim3l.bin skip 0 0;"    \
                                "u-boot-n2.bin skip 0 0"
 #define DFU_ALT_BOOT_VIM3L     "u-boot.bin raw 0x1 0x1000;"    \
-                               "u-boot-kvim3l.bin raw 0x1 0x1000;" \
-                               "u-boot-kvim3.bin skip 0 0;"    \
+                               "u-boot-vim3l.bin raw 0x1 0x1000;" \
+                               "u-boot-vim3.bin skip 0 0;"     \
                                "u-boot-c4.bin skip 0 0;"       \
                                "u-boot-n2.bin skip 0 0"
 #define CONFIG_SET_DFU_ALT_BUF_LEN     (SZ_1K)

diff --git a/packaging/u-boot-kvim3.spec b/packaging/u-boot-kvim3.spec
deleted file mode 100644 (file)
index 3eb2a30..0000000
--- a/packaging/u-boot-kvim3.spec
+++ /dev/null
@@ -1,97 +0,0 @@
-Name: u-boot-kvim3
-Version: 2020.10
-Release: 0
-Summary: Das U-Boot - Tizen bootloader
-Group: System/Kernel
-License: GPL-2.0+
-ExclusiveArch: aarch64
-URL: http://git.denx.de/u-boot.git
-Source0: u-boot-%{version}.tar.bz2
-Source1001: u_boot_amlogic.manifest
-
-Requires(post): coreutils
-BuildRequires: gcc >= 6.0
-BuildRequires: flex
-BuildRequires: bison
-
-%description
-u-boot - Tizen bootloader for Embedded boards based on ARM processor
-
-%prep
-%setup -q -n u-boot-%{version}
-
-%build
-%{?asan:/usr/bin/gcc-unforce-options}
-cp %{SOURCE1001} .
-
-## KVIM3 Build ##
-make mrproper
-
-# Build dtc
-make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc
-
-# Set configuration
-make khadas-vim3_defconfig
-
-# Build tools
-make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools
-
-make HOSTCC="gcc $RPM_OPT_FLAGS" envtools
-
-# Build u-boot
-export PATH="$PATH:tools:tools/dtc/"
-make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
-
-# Encryption
-chmod +x ./fip/aml_encrypt_g12b
-./fip/aml_encrypt_g12b --bl3sig --input u-boot.bin --compress lz4 \
-                               --output fip/kvim3/bl33.bin.enc \
-                               --level v3 --type bl33 --compress lz4
-./fip/aml_encrypt_g12b --bootmk \
-       --output u-boot-kvim3.bin \
-       --bl2 fip/kvim3/bl2.n.bin.sig \
-       --bl30 fip/kvim3/bl30_new.bin.enc \
-       --bl31 fip/kvim3/bl31.img.enc \
-       --bl33 fip/kvim3/bl33.bin.enc \
-       --ddrfw1 fip/kvim3/ddr4_1d.fw \
-       --ddrfw2 fip/kvim3/ddr4_2d.fw \
-       --ddrfw3 fip/kvim3/ddr3_1d.fw \
-       --ddrfw4 fip/kvim3/piei.fw \
-       --ddrfw5 fip/kvim3/lpddr4_1d.fw \
-       --ddrfw6 fip/kvim3/lpddr4_2d.fw \
-       --ddrfw7 fip/kvim3/diag_lpddr4.fw \
-       --ddrfw8 fip/kvim3/aml_ddr.fw \
-       --level v3
-
-# Generate params.bin
-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-vim3.bin default_envs.txt
-rm copy_env_common.o default_envs.txt
-
-# Build Boot script
-mkimage -A arm64 -T script -C none -n "Tizen KVIM3 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg.vim3
-
-%install
-rm -rf %{buildroot}
-
-# u-boot installation
-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-vim3.bin %{buildroot}/boot
-install -m 755 boot.scr.uimg.vim3 %{buildroot}/boot
-
-%post
-mv /boot/boot.scr.uimg.vim3 /boot/boot.scr.uimg
-
-%clean
-
-%files
-%manifest u_boot_amlogic.manifest
-%defattr(-,root,root,-)
-/var/tmp/u-boot-amlogic
-/boot/params-vim3.bin
-/boot/boot.scr.uimg.vim3

diff --git a/packaging/u-boot-kvim3l.spec b/packaging/u-boot-kvim3l.spec
deleted file mode 100644 (file)
index 723c0df..0000000
--- a/packaging/u-boot-kvim3l.spec
+++ /dev/null
@@ -1,97 +0,0 @@
-Name: u-boot-kvim3l
-Version: 2020.10
-Release: 0
-Summary: Das U-Boot - Tizen bootloader
-Group: System/Kernel
-License: GPL-2.0+
-ExclusiveArch: aarch64
-URL: http://git.denx.de/u-boot.git
-Source0: u-boot-%{version}.tar.bz2
-Source1001: u_boot_amlogic.manifest
-
-Requires(post): coreutils
-BuildRequires: gcc >= 6.0
-BuildRequires: flex
-BuildRequires: bison
-
-%description
-u-boot - Tizen bootloader for Embedded boards based on ARM processor
-
-%prep
-%setup -q -n u-boot-%{version}
-
-%build
-%{?asan:/usr/bin/gcc-unforce-options}
-cp %{SOURCE1001} .
-
-## kvim3l Build ##
-make mrproper
-
-# Build dtc
-make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc
-
-# Set configuration
-make khadas-vim3l_defconfig
-
-# Build tools
-make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools
-
-make HOSTCC="gcc $RPM_OPT_FLAGS" envtools
-
-# Build u-boot
-export PATH="$PATH:tools:tools/dtc/"
-make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
-
-# Encryption
-chmod +x ./fip/aml_encrypt_g12a
-./fip/aml_encrypt_g12a --bl3sig --input u-boot.bin --compress lz4 \
-                               --output fip/kvim3l/bl33.bin.enc \
-                               --level v3 --type bl33 --compress lz4
-./fip/aml_encrypt_g12a --bootmk \
-       --output u-boot-kvim3l.bin \
-       --bl2 fip/kvim3l/bl2.n.bin.sig \
-       --bl30 fip/kvim3l/bl30_new.bin.enc \
-       --bl31 fip/kvim3l/bl31.img.enc \
-       --bl33 fip/kvim3l/bl33.bin.enc \
-       --ddrfw1 fip/kvim3l/ddr4_1d.fw \
-       --ddrfw2 fip/kvim3l/ddr4_2d.fw \
-       --ddrfw3 fip/kvim3l/ddr3_1d.fw \
-       --ddrfw4 fip/kvim3l/piei.fw \
-       --ddrfw5 fip/kvim3l/lpddr4_1d.fw \
-       --ddrfw6 fip/kvim3l/lpddr4_2d.fw \
-       --ddrfw7 fip/kvim3l/diag_lpddr4.fw \
-       --ddrfw8 fip/kvim3l/aml_ddr.fw \
-       --level v3
-
-# Generate params.bin
-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-vim3l.bin default_envs.txt
-rm copy_env_common.o default_envs.txt
-
-# Build Boot script
-mkimage -A arm64 -T script -C none -n "Tizen kvim3l u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg.vim3l
-
-%install
-rm -rf %{buildroot}
-
-# u-boot installation
-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-vim3l.bin %{buildroot}/boot
-install -m 755 boot.scr.uimg.vim3l %{buildroot}/boot
-
-%post
-mv /boot/boot.scr.uimg.vim3l /boot/boot.scr.uimg
-
-%clean
-
-%files
-%manifest u_boot_amlogic.manifest
-%defattr(-,root,root,-)
-/var/tmp/u-boot-amlogic
-/boot/params-vim3l.bin
-/boot/boot.scr.uimg.vim3l

diff --git a/packaging/u-boot-vim3.spec b/packaging/u-boot-vim3.spec
new file mode 100644 (file)
index 0000000..7550151
--- /dev/null
+++ b/packaging/u-boot-vim3.spec
@@ -0,0 +1,97 @@
+Name: u-boot-vim3
+Version: 2020.10
+Release: 0
+Summary: Das U-Boot - Tizen bootloader
+Group: System/Kernel
+License: GPL-2.0+
+ExclusiveArch: aarch64
+URL: http://git.denx.de/u-boot.git
+Source0: u-boot-%{version}.tar.bz2
+Source1001: u_boot_amlogic.manifest
+
+Requires(post): coreutils
+BuildRequires: gcc >= 6.0
+BuildRequires: flex
+BuildRequires: bison
+
+%description
+u-boot - Tizen bootloader for Embedded boards based on ARM processor
+
+%prep
+%setup -q -n u-boot-%{version}
+
+%build
+%{?asan:/usr/bin/gcc-unforce-options}
+cp %{SOURCE1001} .
+
+## VIM3 Build ##
+make mrproper
+
+# Build dtc
+make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc
+
+# Set configuration
+make khadas-vim3_defconfig
+
+# Build tools
+make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools
+
+make HOSTCC="gcc $RPM_OPT_FLAGS" envtools
+
+# Build u-boot
+export PATH="$PATH:tools:tools/dtc/"
+make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
+
+# Encryption
+chmod +x ./fip/aml_encrypt_g12b
+./fip/aml_encrypt_g12b --bl3sig --input u-boot.bin --compress lz4 \
+                               --output fip/kvim3/bl33.bin.enc \
+                               --level v3 --type bl33 --compress lz4
+./fip/aml_encrypt_g12b --bootmk \
+       --output u-boot-vim3.bin \
+       --bl2 fip/kvim3/bl2.n.bin.sig \
+       --bl30 fip/kvim3/bl30_new.bin.enc \
+       --bl31 fip/kvim3/bl31.img.enc \
+       --bl33 fip/kvim3/bl33.bin.enc \
+       --ddrfw1 fip/kvim3/ddr4_1d.fw \
+       --ddrfw2 fip/kvim3/ddr4_2d.fw \
+       --ddrfw3 fip/kvim3/ddr3_1d.fw \
+       --ddrfw4 fip/kvim3/piei.fw \
+       --ddrfw5 fip/kvim3/lpddr4_1d.fw \
+       --ddrfw6 fip/kvim3/lpddr4_2d.fw \
+       --ddrfw7 fip/kvim3/diag_lpddr4.fw \
+       --ddrfw8 fip/kvim3/aml_ddr.fw \
+       --level v3
+
+# Generate params.bin
+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-vim3.bin default_envs.txt
+rm copy_env_common.o default_envs.txt
+
+# Build Boot script
+mkimage -A arm64 -T script -C none -n "Tizen KVIM3 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg.vim3
+
+%install
+rm -rf %{buildroot}
+
+# u-boot installation
+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-vim3.bin %{buildroot}/var/tmp/u-boot-amlogic
+install -m 755 params-vim3.bin %{buildroot}/boot
+install -m 755 boot.scr.uimg.vim3 %{buildroot}/boot
+
+%post
+mv /boot/boot.scr.uimg.vim3 /boot/boot.scr.uimg
+
+%clean
+
+%files
+%manifest u_boot_amlogic.manifest
+%defattr(-,root,root,-)
+/var/tmp/u-boot-amlogic
+/boot/params-vim3.bin
+/boot/boot.scr.uimg.vim3

diff --git a/packaging/u-boot-vim3l.spec b/packaging/u-boot-vim3l.spec
new file mode 100644 (file)
index 0000000..adb5a2c
--- /dev/null
+++ b/packaging/u-boot-vim3l.spec
@@ -0,0 +1,97 @@
+Name: u-boot-vim3l
+Version: 2020.10
+Release: 0
+Summary: Das U-Boot - Tizen bootloader
+Group: System/Kernel
+License: GPL-2.0+
+ExclusiveArch: aarch64
+URL: http://git.denx.de/u-boot.git
+Source0: u-boot-%{version}.tar.bz2
+Source1001: u_boot_amlogic.manifest
+
+Requires(post): coreutils
+BuildRequires: gcc >= 6.0
+BuildRequires: flex
+BuildRequires: bison
+
+%description
+u-boot - Tizen bootloader for Embedded boards based on ARM processor
+
+%prep
+%setup -q -n u-boot-%{version}
+
+%build
+%{?asan:/usr/bin/gcc-unforce-options}
+cp %{SOURCE1001} .
+
+## vim3l Build ##
+make mrproper
+
+# Build dtc
+make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc
+
+# Set configuration
+make khadas-vim3l_defconfig
+
+# Build tools
+make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools
+
+make HOSTCC="gcc $RPM_OPT_FLAGS" envtools
+
+# Build u-boot
+export PATH="$PATH:tools:tools/dtc/"
+make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'`
+
+# Encryption
+chmod +x ./fip/aml_encrypt_g12a
+./fip/aml_encrypt_g12a --bl3sig --input u-boot.bin --compress lz4 \
+                               --output fip/kvim3l/bl33.bin.enc \
+                               --level v3 --type bl33 --compress lz4
+./fip/aml_encrypt_g12a --bootmk \
+       --output u-boot-vim3l.bin \
+       --bl2 fip/kvim3l/bl2.n.bin.sig \
+       --bl30 fip/kvim3l/bl30_new.bin.enc \
+       --bl31 fip/kvim3l/bl31.img.enc \
+       --bl33 fip/kvim3l/bl33.bin.enc \
+       --ddrfw1 fip/kvim3l/ddr4_1d.fw \
+       --ddrfw2 fip/kvim3l/ddr4_2d.fw \
+       --ddrfw3 fip/kvim3l/ddr3_1d.fw \
+       --ddrfw4 fip/kvim3l/piei.fw \
+       --ddrfw5 fip/kvim3l/lpddr4_1d.fw \
+       --ddrfw6 fip/kvim3l/lpddr4_2d.fw \
+       --ddrfw7 fip/kvim3l/diag_lpddr4.fw \
+       --ddrfw8 fip/kvim3l/aml_ddr.fw \
+       --level v3
+
+# Generate params.bin
+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-vim3l.bin default_envs.txt
+rm copy_env_common.o default_envs.txt
+
+# Build Boot script
+mkimage -A arm64 -T script -C none -n "Tizen kvim3l u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg.vim3l
+
+%install
+rm -rf %{buildroot}
+
+# u-boot installation
+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-vim3l.bin %{buildroot}/var/tmp/u-boot-amlogic
+install -m 755 params-vim3l.bin %{buildroot}/boot
+install -m 755 boot.scr.uimg.vim3l %{buildroot}/boot
+
+%post
+mv /boot/boot.scr.uimg.vim3l /boot/boot.scr.uimg
+
+%clean
+
+%files
+%manifest u_boot_amlogic.manifest
+%defattr(-,root,root,-)
+/var/tmp/u-boot-amlogic
+/boot/params-vim3l.bin
+/boot/boot.scr.uimg.vim3l

diff --git a/tizen/build-amlogic.sh b/tizen/build-amlogic.sh
index 42d4d88167ea9474421a6227794de48213de522d..fc94f600775081654b6c82525571aebfbc4af022 100755 (executable)
--- a/tizen/build-amlogic.sh
+++ b/tizen/build-amlogic.sh
@@ -28,7 +28,7 @@ vim3)
        ENCRYPT=fip/aml_encrypt_g12b
        NAME="Khadas VIM3"
        PARAMS=params-vim3.bin
-       OUTPUT_BIN=u-boot-kvim3.bin
+       OUTPUT_BIN=u-boot-vim3.bin
        OUTPUT_TAR=kvim3_bootloader.tar
 ;;
 vim3l)
@@ -37,7 +37,7 @@ vim3l)
        ENCRYPT=fip/aml_encrypt_g12a
        NAME="Khadas VIM3L"
        PARAMS=params-vim3l.bin
-       OUTPUT_BIN=u-boot-kvim3l.bin
+       OUTPUT_BIN=u-boot-vim3l.bin
        OUTPUT_TAR=kvim3l_bootloader.tar
 ;;
 *)