From 7b2a5e498e29096ca36a7517d6b1919ce79dd132 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Mon, 30 Nov 2020 15:13:51 +0100 Subject: [PATCH] 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 Change-Id: Ia8e4cca3bc96cd1408b75c2bae4d2a29ccd41160 --- include/samsung/tizen_amlogic.h | 16 ++++++++-------- packaging/{u-boot-kvim3.spec => u-boot-vim3.spec} | 8 ++++---- packaging/{u-boot-kvim3l.spec => u-boot-vim3l.spec} | 8 ++++---- tizen/build-amlogic.sh | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) rename packaging/{u-boot-kvim3.spec => u-boot-vim3.spec} (94%) rename packaging/{u-boot-kvim3l.spec => u-boot-vim3l.spec} (94%) diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h index be4a4e6..38d9ec1 100644 --- 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-vim3.spec similarity index 94% rename from packaging/u-boot-kvim3.spec rename to packaging/u-boot-vim3.spec index 3eb2a30..7550151 100644 --- a/packaging/u-boot-kvim3.spec +++ b/packaging/u-boot-vim3.spec @@ -1,4 +1,4 @@ -Name: u-boot-kvim3 +Name: u-boot-vim3 Version: 2020.10 Release: 0 Summary: Das U-Boot - Tizen bootloader @@ -24,7 +24,7 @@ u-boot - Tizen bootloader for Embedded boards based on ARM processor %{?asan:/usr/bin/gcc-unforce-options} cp %{SOURCE1001} . -## KVIM3 Build ## +## VIM3 Build ## make mrproper # Build dtc @@ -48,7 +48,7 @@ chmod +x ./fip/aml_encrypt_g12b --output fip/kvim3/bl33.bin.enc \ --level v3 --type bl33 --compress lz4 ./fip/aml_encrypt_g12b --bootmk \ - --output u-boot-kvim3.bin \ + --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 \ @@ -80,7 +80,7 @@ rm -rf %{buildroot} 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 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 diff --git a/packaging/u-boot-kvim3l.spec b/packaging/u-boot-vim3l.spec similarity index 94% rename from packaging/u-boot-kvim3l.spec rename to packaging/u-boot-vim3l.spec index 723c0df..adb5a2c 100644 --- a/packaging/u-boot-kvim3l.spec +++ b/packaging/u-boot-vim3l.spec @@ -1,4 +1,4 @@ -Name: u-boot-kvim3l +Name: u-boot-vim3l Version: 2020.10 Release: 0 Summary: Das U-Boot - Tizen bootloader @@ -24,7 +24,7 @@ u-boot - Tizen bootloader for Embedded boards based on ARM processor %{?asan:/usr/bin/gcc-unforce-options} cp %{SOURCE1001} . -## kvim3l Build ## +## vim3l Build ## make mrproper # Build dtc @@ -48,7 +48,7 @@ chmod +x ./fip/aml_encrypt_g12a --output fip/kvim3l/bl33.bin.enc \ --level v3 --type bl33 --compress lz4 ./fip/aml_encrypt_g12a --bootmk \ - --output u-boot-kvim3l.bin \ + --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 \ @@ -80,7 +80,7 @@ rm -rf %{buildroot} 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 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 diff --git a/tizen/build-amlogic.sh b/tizen/build-amlogic.sh index 42d4d88..fc94f60 100755 --- 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 ;; *) -- 2.7.4