From: Jaehoon Chung Date: Thu, 19 Nov 2020 03:28:29 +0000 (+0900) Subject: tizen: amlogic: remove unused environment values X-Git-Tag: submit/tizen/20201208.071016~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1675e1c39215bb72b44d378f6815087ce9efb05;p=platform%2Fkernel%2Fu-boot.git tizen: amlogic: remove unused environment values Remove unused environment values. It doesn't need to enter the flash mode with inform file. If it needs to consider the flash mode, then we can use Amlogic's scheme with secure monitor command. Change-Id: Ia5374f7b2f411c3a48c0d469c837541875f0f84a Signed-off-by: Jaehoon Chung --- diff --git a/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr b/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr index 973878d55c..28ce7e9aab 100644 --- a/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr +++ b/board/amlogic/odroid-n2/tizen-boot-odroid-c4-64b.scr @@ -25,19 +25,6 @@ setenv tizen_kernel_addr_r "0x2400000" setenv tizen_tmp_kernel_addr_r "0x1000000" setenv ramdisk_addr_r "0x1b00000" -# This is for jumping to flash mode on u-boot. -if test "${bootmode}" = "download"; then; - setenv ramdiskpart 8 - setenv ramdisksize c00000 - setenv bootmode flash -fi - -if test "${bootmode}" = "flash"; then; - if test -n "${ipaddr}"; then; - ip_opt=\"ip=${ipaddr}::${gateway}:${netmask}\" - fi -fi - # boot from ram0 if there is sbin if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; setenv rootdev ram0 diff --git a/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr b/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr index 0a9364eaa5..186837abd7 100644 --- a/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr +++ b/board/amlogic/w400/tizen-boot-khadas-vim3-64b.scr @@ -49,19 +49,6 @@ setenv tizen_kernel_addr_r "0x2400000" setenv tizen_tmp_kernel_addr_r "0x1000000" setenv ramdisk_addr_r "0x1b00000" -# This is for jumping to flash mode on u-boot. -if test "${bootmode}" = "download"; then; - setenv ramdiskpart 8 - setenv ramdisksize c00000 - setenv bootmode flash -fi - -if test "${bootmode}" = "flash"; then; - if test -n "${ipaddr}"; then; - ip_opt=\"ip=${ipaddr}::${gateway}:${netmask}\" - fi -fi - # boot from ram0 if there is sbin if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; setenv rootdev ram0 diff --git a/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr b/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr index 63968d5a2f..9ebc49d18a 100644 --- a/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr +++ b/board/amlogic/w400/tizen-boot-odroid-n2-64b.scr @@ -97,19 +97,6 @@ setenv tizen_kernel_addr_r "0x2400000" setenv tizen_tmp_kernel_addr_r "0x1000000" setenv ramdisk_addr_r "0x1b00000" -# This is for jumping to flash mode on u-boot. -if test "${bootmode}" = "download"; then; - setenv ramdiskpart 8 - setenv ramdisksize c00000 - setenv bootmode flash -fi - -if test "${bootmode}" = "flash"; then; - if test -n "${ipaddr}"; then; - ip_opt=\"ip=${ipaddr}::${gateway}:${netmask}\" - fi -fi - # boot from ram0 if there is sbin if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; setenv rootdev ram0 diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h index 5e35c54222..a12246c802 100644 --- a/include/samsung/tizen_amlogic.h +++ b/include/samsung/tizen_amlogic.h @@ -80,18 +80,10 @@ #define TIZEN_ENV_SETTING \ "mmcbootpart=1\0" \ "mmcrootpart=2\0" \ - "mmcinformpart=9\0" \ - "rebootparamfile=reboot-param.bin\0" \ - "rebootparam_addr=0x02100000\0" \ - "upgrade_val=72677075\0" \ - "recovery_val=72766372\0" \ - "nodef_val=6665646e\0" \ - "download_val=6c6e7764\0" \ "ramdiskpart=7\0" \ "ramdisksize=800000\0" \ "bootmode=ramdisk\0" \ "bootdev=mmc\0" \ - "tfm=setenv bootmode download; run bootcmd\0" \ "dfu_alt_info=" DFU_ALT_SYSTEM ";" DFU_ALT_BOOT "\0"\ "fdt_high=0x20000000\0" \ "initrd_high=0x3d800000\0" \