From: Ion Agorria <[email protected]> Update the flashing scripts used by the bootmenu that calls ebtupdate, now bootloader image is enough. Add ebt in picasso and n1 oem format table as these devices may lack enough space for bootloader in eMMC boot1.
Signed-off-by: Ion Agorria <[email protected]> Signed-off-by: Svyatoslav Ryhel <[email protected]> --- board/acer/picasso/picasso.env | 5 +- board/asus/transformer-t30/board-info.c | 6 -- .../asus/transformer-t30/transformer-t30.env | 2 +- .../ideapad-yoga-11/ideapad-yoga-11.env | 2 +- board/samsung/n1/n1.env | 4 +- board/xiaomi/mocha/mocha.env | 4 -- include/env/nvidia/prod_upd.env | 66 +++---------------- 7 files changed, 13 insertions(+), 76 deletions(-) diff --git a/board/acer/picasso/picasso.env b/board/acer/picasso/picasso.env index d9409b07d98..b40e0c0a198 100644 --- a/board/acer/picasso/picasso.env +++ b/board/acer/picasso/picasso.env @@ -2,10 +2,7 @@ button_cmd_0_name=Volume Down button_cmd_0=bootmenu -partitions=name=emmc,start=0,size=-,uuid=${uuid_gpt_rootfs} - -boot_block_size_r=0x100000 -boot_block_size=0x800 +partitions=name=ebt,start=64K,size=2M,uuid=${uuid_gpt_ebt};name=rootfs,size=-,uuid=${uuid_gpt_rootfs} boot_dev=1 bootmenu_0=mount internal storage=usb start && ums 0 mmc 0; bootmenu diff --git a/board/asus/transformer-t30/board-info.c b/board/asus/transformer-t30/board-info.c index e72614164b4..4bda85a6b2d 100644 --- a/board/asus/transformer-t30/board-info.c +++ b/board/asus/transformer-t30/board-info.c @@ -83,12 +83,6 @@ static int get_project_id(void) log_debug("[TRANSFORMER]: project id %d (%s)\n", proj_id, project_id_to_fdt[proj_id]); - /* Mark tablet with SPI flash */ - if (proj_id == TF600T) - env_set_hex("spiflash", true); - else - env_set_hex("spiflash", false); - return proj_id & 0xf; } diff --git a/board/asus/transformer-t30/transformer-t30.env b/board/asus/transformer-t30/transformer-t30.env index 9b6f4079f84..2f7e8206c24 100644 --- a/board/asus/transformer-t30/transformer-t30.env +++ b/board/asus/transformer-t30/transformer-t30.env @@ -1,7 +1,7 @@ #include <env/nvidia/prod_upd.env> button_cmd_0_name=Volume Down -button_cmd_0=if spiflash; then run update_spi; else bootmenu; fi +button_cmd_0=bootmenu button_cmd_1_name=Lid sensor button_cmd_1=poweroff partitions=name=emmc,start=0,size=-,uuid=${uuid_gpt_rootfs} diff --git a/board/lenovo/ideapad-yoga-11/ideapad-yoga-11.env b/board/lenovo/ideapad-yoga-11/ideapad-yoga-11.env index 7bc2b80c480..2f7c8b62f1a 100644 --- a/board/lenovo/ideapad-yoga-11/ideapad-yoga-11.env +++ b/board/lenovo/ideapad-yoga-11/ideapad-yoga-11.env @@ -9,7 +9,7 @@ partitions=name=emmc,start=0,size=-,uuid=${uuid_gpt_rootfs} bootmenu_0=mount internal storage=usb start && ums 0 mmc 0; bootmenu bootmenu_1=mount external storage=usb start && ums 0 mmc 1; bootmenu bootmenu_2=fastboot=echo Starting Fastboot protocol ...; fastboot usb 0; bootmenu -bootmenu_3=update bootloader=run update_spi +bootmenu_3=update bootloader=run flash_uboot bootmenu_4=reboot RCM=enterrcm bootmenu_5=reboot=reset bootmenu_6=power off=poweroff diff --git a/board/samsung/n1/n1.env b/board/samsung/n1/n1.env index e2b883dbc10..9b20ea6e40a 100644 --- a/board/samsung/n1/n1.env +++ b/board/samsung/n1/n1.env @@ -2,9 +2,7 @@ button_cmd_0_name=Volume Down button_cmd_0=bootmenu - -boot_block_size_r=0x80000 -boot_block_size=0x400 +partitions=name=ebt,start=64K,size=2M,uuid=${uuid_gpt_ebt};name=rootfs,size=-,uuid=${uuid_gpt_rootfs} boot_dev=1 bootmenu_0=mount internal storage=usb start && ums 0 mmc 0; bootmenu diff --git a/board/xiaomi/mocha/mocha.env b/board/xiaomi/mocha/mocha.env index d93e24316f6..cca6424fc80 100644 --- a/board/xiaomi/mocha/mocha.env +++ b/board/xiaomi/mocha/mocha.env @@ -6,11 +6,7 @@ button_cmd_1_name=Hall sensor (back) button_cmd_1=poweroff button_cmd_1_name=Hall sensor (front) button_cmd_1=poweroff - partitions=name=emmc,start=0,size=-,uuid=${uuid_gpt_rootfs} - -boot_block_size_r=0x400000 -boot_block_size=0x2000 boot_dev=1 bootmenu_0=mount internal storage=usb start && ums 0 mmc 0; bootmenu diff --git a/include/env/nvidia/prod_upd.env b/include/env/nvidia/prod_upd.env index 6a457d1b75b..2c5db0c138c 100644 --- a/include/env/nvidia/prod_upd.env +++ b/include/env/nvidia/prod_upd.env @@ -1,61 +1,13 @@ -boot_block_size_r=0x200000 -boot_block_size=0x1000 bootloader_file=u-boot-dtb-tegra.bin -spi_size=0x400000 boot_dev=0 boot_interface=mmc -flash_uboot=echo Preparing RAM; - mw ${kernel_addr_r} 0 ${boot_block_size_r}; - mw ${ramdisk_addr_r} 0 ${boot_block_size_r}; - echo Reading BCT; - mmc dev 0 1; - mmc read ${kernel_addr_r} 0 ${boot_block_size}; - echo Reading bootloader; - if load ${boot_interface} ${boot_dev}:1 ${ramdisk_addr_r} ${bootloader_file}; - then echo Calculating bootloader size; - size ${boot_interface} ${boot_dev}:1 ${bootloader_file}; - ebtupdate ${kernel_addr_r} ${ramdisk_addr_r} ${filesize}; - echo Writing bootloader to eMMC; - mmc dev 0 1; - mmc write ${kernel_addr_r} 0 ${boot_block_size}; - mmc dev 0 2; - mmc write ${ramdisk_addr_r} 0 ${boot_block_size}; - echo Bootloader written successfully; - pause 'Press ANY key to reboot device...'; reset; - else echo Reading bootloader failed; - pause 'Press ANY key to return to bootmenu...'; bootmenu; fi - -update_spi=sf probe 0:1; - echo Dumping current SPI flash content ...; - sf read ${kernel_addr_r} 0x0 ${spi_size}; - if fatwrite mmc 1:1 ${kernel_addr_r} spi-flash-backup.bin ${spi_size}; - then echo SPI flash content was successfully written into spi-flash-backup.bin; - echo Reading SPI flash binary; - if load mmc 1:1 ${kernel_addr_r} repart-block.bin; - then echo Writing bootloader into SPI flash; - sf probe 0:1; - sf update ${kernel_addr_r} 0x0 ${spi_size}; - echo Bootloader SUCCESSFULLY written into SPI flash; - pause 'Press ANY key to reboot...'; reset; - else echo Preparing RAM; - mw ${kernel_addr_r} 0 ${boot_block_size_r}; - mw ${ramdisk_addr_r} 0 ${boot_block_size_r}; - echo Reading BCT; - sf read ${kernel_addr_r} 0x0 ${boot_block_size_r}; - echo Reading bootloader; - if load mmc 1:1 ${ramdisk_addr_r} ${bootloader_file}; - then echo Calculating bootloader size; - size mmc 1:1 ${bootloader_file}; - ebtupdate ${kernel_addr_r} ${ramdisk_addr_r} ${filesize}; - echo Writing bootloader into SPI flash; - sf probe 0:1; - sf update ${kernel_addr_r} 0x0 ${boot_block_size_r}; - sf update ${ramdisk_addr_r} ${boot_block_size_r} ${boot_block_size_r}; - echo Bootloader written SUCCESSFULLY; - pause 'Press ANY key to reboot...'; reset; - else echo Reading bootloader failed; - pause 'Press ANY key to reboot...'; reset; fi; - fi; - else echo SPI flash backup FAILED! Aborting ...; - pause 'Press ANY key to reboot...'; reset; fi +flash_uboot=echo Reading bootloader; + if load ${boot_interface} ${boot_dev}:1 ${ramdisk_addr_r} ${bootloader_file}; + then echo Calculating bootloader size; + size ${boot_interface} ${boot_dev}:1 ${bootloader_file}; + echo Writing bootloader to ${boot_interface} ${boot_dev}...; + ebtupdate ${ramdisk_addr_r} ${filesize}; + pause 'Press ANY key to reboot device...'; reset; + else echo Reading bootloader failed; + pause 'Press ANY key to return to bootmenu...'; bootmenu; fi -- 2.53.0
