diff options
| -rw-r--r-- | packaging/u-boot-amlogic.spec | 6 | ||||
| -rw-r--r-- | packaging/u-boot-rpi3-32b.spec | 6 | ||||
| -rw-r--r-- | packaging/u-boot-rpi3.spec | 6 | ||||
| -rw-r--r-- | packaging/u-boot-rpi4-32b.spec | 6 | ||||
| -rw-r--r-- | packaging/u-boot-rpi4.spec | 6 | ||||
| -rwxr-xr-x | tizen/build-amlogic.sh | 6 |
6 files changed, 12 insertions, 24 deletions
diff --git a/packaging/u-boot-amlogic.spec b/packaging/u-boot-amlogic.spec index c16a91efdc..b1ad5c9263 100644 --- a/packaging/u-boot-amlogic.spec +++ b/packaging/u-boot-amlogic.spec @@ -146,11 +146,9 @@ for i in %{TARGETS}; do --level v3 # 1-6. 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 + ./scripts/get_default_envs.sh > default_envs.txt mkenvimage -s 16384 -o ${PARAMS} default_envs.txt - rm copy_env_common.o default_envs.txt + rm default_envs.txt done # 1-7. Build Boot script diff --git a/packaging/u-boot-rpi3-32b.spec b/packaging/u-boot-rpi3-32b.spec index bf82cd1244..f4dd7cb4a5 100644 --- a/packaging/u-boot-rpi3-32b.spec +++ b/packaging/u-boot-rpi3-32b.spec @@ -54,11 +54,9 @@ export PATH="$PATH:tools:tools/dtc/" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate uboot.env -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 +./scripts/get_default_envs.sh > default_envs.txt mkenvimage -s 16384 -o uboot.env default_envs.txt -rm copy_env_common.o default_envs.txt +rm default_envs.txt # Build boot.scr mkimage -A arm -T script -C none -n "Tizen RPI3 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi3.scr ./boot.scr.uimg diff --git a/packaging/u-boot-rpi3.spec b/packaging/u-boot-rpi3.spec index 1eda16e283..1b623ad31e 100644 --- a/packaging/u-boot-rpi3.spec +++ b/packaging/u-boot-rpi3.spec @@ -54,11 +54,9 @@ export PATH="$PATH:tools:tools/dtc/" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # 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 +./scripts/get_default_envs.sh > default_envs.txt mkenvimage -s 16384 -o uboot.env default_envs.txt -rm copy_env_common.o default_envs.txt +rm default_envs.txt # Build boot.scr mkimage -A arm64 -T script -C none -n "Tizen RPI3 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi3.scr ./boot.scr.uimg diff --git a/packaging/u-boot-rpi4-32b.spec b/packaging/u-boot-rpi4-32b.spec index 5238086304..bad2d721c5 100644 --- a/packaging/u-boot-rpi4-32b.spec +++ b/packaging/u-boot-rpi4-32b.spec @@ -43,11 +43,9 @@ export PATH="$PATH:tools:tools/dtc/" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate uboot.env -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 +./scripts/get_default_envs.sh > default_envs.txt mkenvimage -s 16384 -o uboot.env default_envs.txt -rm copy_env_common.o default_envs.txt +rm default_envs.txt # Build boot.scr mkimage -A arm -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi4.scr ./boot.scr.uimg diff --git a/packaging/u-boot-rpi4.spec b/packaging/u-boot-rpi4.spec index 38bab3484d..ed0c7d5675 100644 --- a/packaging/u-boot-rpi4.spec +++ b/packaging/u-boot-rpi4.spec @@ -43,11 +43,9 @@ export PATH="$PATH:tools:tools/dtc/" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate uboot.env -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 +./scripts/get_default_envs.sh > default_envs.txt mkenvimage -s 16384 -o uboot.env default_envs.txt -rm copy_env_common.o default_envs.txt +rm default_envs.txt # Build boot.scr mkimage -A arm64 -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootscript/tizen-boot-rpi4.scr ./boot.scr.uimg diff --git a/tizen/build-amlogic.sh b/tizen/build-amlogic.sh index a4bf923085..c8d651d2c8 100755 --- a/tizen/build-amlogic.sh +++ b/tizen/build-amlogic.sh @@ -85,11 +85,9 @@ build_uboot() } generate_param() { - cp `find ./env -name "built-in.o"` copy_env_common.o - ${CROSS_COMPILE}objcopy -O binary --only-section=.rodata.default_environment `find . -name "copy_env_common.o"` - tr '\0' '\n' < copy_env_common.o > default_envs.txt + CROSS_COMPILE="$CROSS_COMPILE" ./scripts/get_default_envs.sh > default_envs.txt ./tools/mkenvimage -s 16384 -o params.bin default_envs.txt - rm copy_env_common.o default_envs.txt + rm default_envs.txt } build_amlogic() |