From: Jaehoon Chung Date: Fri, 27 Nov 2020 08:24:22 +0000 (+0900) Subject: packaging: amlogic: use one boot.scr.uimg script X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f021028cfe540eaf820030a87b1959129bcd897;p=platform%2Fkernel%2Fu-boot.git packaging: amlogic: use one boot.scr.uimg script Use one boot.scr.uimg instead of each scsripts. To prevent conflict, move to boot.scr.uimg after installed each script. Also change the place of boot.scr.uimg in build script. Change-Id: Ia7d0746062f6d548ae1fb36a7111d55d353a1545 Signed-off-by: Jaehoon Chung --- diff --git a/packaging/u-boot-c4.spec b/packaging/u-boot-c4.spec index c5a1de9a22..269d5e9521 100644 --- a/packaging/u-boot-c4.spec +++ b/packaging/u-boot-c4.spec @@ -9,6 +9,7 @@ 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 @@ -70,7 +71,7 @@ mkenvimage -s 16384 -o params.bin default_envs.txt rm copy_env_common.o default_envs.txt # 1-7. Build Boot script -mkimage -A arm64 -T script -C none -n "Tizen ODROID-c4 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg +mkimage -A arm64 -T script -C none -n "Tizen ODROID-c4 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg.c4 %install @@ -82,7 +83,10 @@ 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 boot.scr.uimg %{buildroot}/boot/odroid-c4 +install -m 755 boot.scr.uimg.c4 %{buildroot}/boot/ + +%post +mv /boot/boot.scr.uimg.c4 /boot/boot.scr.uimg %clean @@ -91,4 +95,4 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/odroid-c4 %defattr(-,root,root,-) /var/tmp/u-boot-amlogic /boot/odroid-c4/params.bin -/boot/odroid-c4/boot.scr.uimg +/boot/boot.scr.uimg.c4 diff --git a/packaging/u-boot-kvim3.spec b/packaging/u-boot-kvim3.spec index ce08e89431..253476d22c 100644 --- a/packaging/u-boot-kvim3.spec +++ b/packaging/u-boot-kvim3.spec @@ -9,6 +9,7 @@ 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 @@ -70,7 +71,7 @@ mkenvimage -s 16384 -o params.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 +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} @@ -81,7 +82,10 @@ 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 boot.scr.uimg %{buildroot}/boot/vim3 +install -m 755 boot.scr.uimg.vim3 %{buildroot}/boot + +%post +mv /boot/boot.scr.uimg.vim3 /boot/boot.scr.uimg %clean @@ -90,4 +94,4 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/vim3 %defattr(-,root,root,-) /var/tmp/u-boot-amlogic /boot/vim3/params.bin -/boot/vim3/boot.scr.uimg +/boot/boot.scr.uimg.vim3 diff --git a/packaging/u-boot-kvim3l.spec b/packaging/u-boot-kvim3l.spec index bffde4f853..5e9c37ee96 100644 --- a/packaging/u-boot-kvim3l.spec +++ b/packaging/u-boot-kvim3l.spec @@ -9,6 +9,7 @@ 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 @@ -70,7 +71,7 @@ mkenvimage -s 16384 -o params.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 +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} @@ -81,7 +82,10 @@ 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 boot.scr.uimg %{buildroot}/boot/vim3l +install -m 755 boot.scr.uimg.vim3l %{buildroot}/boot + +%post +mv /boot/boot.scr.uimg.vim3l /boot/boot.scr.uimg %clean @@ -90,4 +94,4 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/vim3l %defattr(-,root,root,-) /var/tmp/u-boot-amlogic /boot/vim3l/params.bin -/boot/vim3l/boot.scr.uimg +/boot/boot.scr.uimg.vim3l diff --git a/packaging/u-boot-n2.spec b/packaging/u-boot-n2.spec index 599ba14594..ffc7439475 100644 --- a/packaging/u-boot-n2.spec +++ b/packaging/u-boot-n2.spec @@ -9,6 +9,7 @@ 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 @@ -70,7 +71,7 @@ mkenvimage -s 16384 -o params.bin default_envs.txt rm copy_env_common.o default_envs.txt # 1-7. Build Boot script -mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg +mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./boot.scr.uimg.n2 %install @@ -82,7 +83,10 @@ 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 boot.scr.uimg %{buildroot}/boot/odroid-n2 +install -m 755 boot.scr.uimg.n2 %{buildroot}/boot/ + +%post +mv /boot/boot.scr.uimg.n2 /boot/boot.scr.uimg %clean @@ -91,4 +95,4 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/odroid-n2 %defattr(-,root,root,-) /var/tmp/u-boot-amlogic /boot/odroid-n2/params.bin -/boot/odroid-n2/boot.scr.uimg +/boot/boot.scr.uimg.n2 diff --git a/tizen/build-kvim3.sh b/tizen/build-kvim3.sh index db588c1808..5cde2ff054 100755 --- a/tizen/build-kvim3.sh +++ b/tizen/build-kvim3.sh @@ -34,7 +34,7 @@ build_uboot() fi make CROSS_COMPILE="$CCACHE $CROSS_COMPILE" $JOBS - ./tools/mkimage -A arm64 -T script -C none -n "Tizen Khadas $BOARD u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/$BOARD/boot.scr.uimg + ./tools/mkimage -A arm64 -T script -C none -n "Tizen Khadas $BOARD u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/boot.scr.uimg } @@ -75,7 +75,7 @@ build_vim3() cp params.bin output/vim3/ cp arch/arm/dts/meson-g12b-a311d-khadas-vim3.dtb ./output/ cd ./output/ - tar cvf kvim3_bootloader.tar u-boot-kvim3.bin vim3/boot.scr.uimg vim3/params.bin + tar cvf kvim3_bootloader.tar u-boot-kvim3.bin boot.scr.uimg vim3/params.bin cd .. } @@ -107,7 +107,7 @@ build_vim3l() cp params.bin output/vim3l/ cd ./output/ - tar cvf kvim3l_bootloader.tar u-boot-kvim3l.bin vim3l/boot.scr.uimg vim3l/params.bin + tar cvf kvim3l_bootloader.tar u-boot-kvim3l.bin boot.scr.uimg vim3l/params.bin cd .. } diff --git a/tizen/build-odroid-c4.sh b/tizen/build-odroid-c4.sh index 8aec257655..20cc753997 100755 --- a/tizen/build-odroid-c4.sh +++ b/tizen/build-odroid-c4.sh @@ -25,7 +25,7 @@ build_uboot() make ARCH=arm64 odroid-c4_defconfig fi make CROSS_COMPILE="$CCACHE $CROSS_COMPILE" $JOBS - ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-C4 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/odroid-c4/boot.scr.uimg + ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-C4 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/boot.scr.uimg } @@ -68,7 +68,7 @@ build_amlogic() cp params.bin output/odroid-c4/ cp arch/arm/dts/meson-sm1-odroid-c4.dtb ./output/ cd ./output/ - tar cvf odroidc4_bootloader.tar u-boot-c4.bin odroid-c4/boot.scr.uimg odroid-c4/params.bin + tar cvf odroidc4_bootloader.tar u-boot-c4.bin boot.scr.uimg odroid-c4/params.bin cd .. } diff --git a/tizen/build-odroid-n2.sh b/tizen/build-odroid-n2.sh index 0e0634cfd7..36758dff27 100755 --- a/tizen/build-odroid-n2.sh +++ b/tizen/build-odroid-n2.sh @@ -25,7 +25,7 @@ build_uboot() make ARCH=arm64 odroid-n2_defconfig fi make CROSS_COMPILE="$CCACHE $CROSS_COMPILE" $JOBS - ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/odroid-n2/boot.scr.uimg + ./tools/mkimage -A arm64 -T script -C none -n "Tizen ODROID-N2 u-boot helper" -d ./tizen/bootscript/tizen-boot-amlogic-64b.scr ./output/boot.scr.uimg } @@ -67,7 +67,7 @@ build_amlogic() cp params.bin output/odroid-n2/ cp arch/arm/dts/meson-g12b-odroid-n2.dtb ./output/ cd ./output/ - tar cvf odroidn2_bootloader.tar u-boot-n2.bin odroid-n2/boot.scr.uimg odroid-n2/params.bin + tar cvf odroidn2_bootloader.tar u-boot-n2.bin boot.scr.uimg odroid-n2/params.bin cd .. }