diff options
| author | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-06-18 13:36:30 -0700 |
|---|---|---|
| committer | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-06-18 13:36:30 -0700 |
| commit | e1290a703c9a9c44ebf23815978d470e574fa650 (patch) | |
| tree | d819b2d052cb2555f889d15370b33cc59d25d1b5 | |
| parent | cb55cff1cc5572dce1fc4803a960975b09458ee5 (diff) | |
imx: Update the U-Boot upgrade script, remove duplicates
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
| -rw-r--r-- | board/boundary/h/6x_upgrade.txt | 45 | ||||
| -rw-r--r-- | board/boundary/nit6xlite/6x_upgrade.txt | 45 | ||||
| -rw-r--r-- | board/boundary/nitrogen6x/6x_upgrade.txt | 6 | ||||
| -rw-r--r-- | board/boundary/oc/6x_upgrade.txt | 45 |
4 files changed, 5 insertions, 136 deletions
diff --git a/board/boundary/h/6x_upgrade.txt b/board/boundary/h/6x_upgrade.txt deleted file mode 100644 index 0b8db73a14..0000000000 --- a/board/boundary/h/6x_upgrade.txt +++ /dev/null @@ -1,45 +0,0 @@ -setenv stdout serial,vga -echo "check U-Boot" ; -setenv offset 0x400 -if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx ; then - echo "read $filesize bytes from SD card" ; - if sf probe || sf probe || \ - sf probe 1 27000000 || sf probe 1 27000000 ; then - echo "probed SPI ROM" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - echo "------- U-Boot versions match" ; - else - echo "Need U-Boot upgrade" ; - echo "Program in 5 seconds" ; - for n in 5 4 3 2 1 ; do - echo $n ; - sleep 1 ; - done - echo "erasing" ; - sf erase 0 0xC0000 ; - # two steps to prevent bricking - echo "programming" ; - sf write 0x12000000 $offset $filesize ; - echo "verifying" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - while echo "---- U-Boot upgraded. reset" ; do - sleep 120 - done - else - echo "Read verification error" ; - fi - else - echo "Error re-reading EEPROM" ; - fi - fi - else - echo "Error reading boot loader from EEPROM" ; - fi - else - echo "Error initializing EEPROM" ; - fi ; -else - echo "No U-Boot image found on SD card" ; -fi diff --git a/board/boundary/nit6xlite/6x_upgrade.txt b/board/boundary/nit6xlite/6x_upgrade.txt deleted file mode 100644 index ad3d0b62c1..0000000000 --- a/board/boundary/nit6xlite/6x_upgrade.txt +++ /dev/null @@ -1,45 +0,0 @@ -setenv stdout serial,vga -echo "check U-Boot" ; -setenv offset 0x400 -if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then - echo "read $filesize bytes from SD card" ; - if sf probe || sf probe || \ - sf probe 1 27000000 || sf probe 1 27000000 ; then - echo "probed SPI ROM" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - echo "------- U-Boot versions match" ; - else - echo "Need U-Boot upgrade" ; - echo "Program in 5 seconds" ; - for n in 5 4 3 2 1 ; do - echo $n ; - sleep 1 ; - done - echo "erasing" ; - sf erase 0 0xC0000 ; - # two steps to prevent bricking - echo "programming" ; - sf write 0x12000000 $offset $filesize ; - echo "verifying" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - while echo "---- U-Boot upgraded. reset" ; do - sleep 120 - done - else - echo "Read verification error" ; - fi - else - echo "Error re-reading EEPROM" ; - fi - fi - else - echo "Error reading boot loader from EEPROM" ; - fi - else - echo "Error initializing EEPROM" ; - fi ; -else - echo "No U-Boot image found on SD card" ; -fi diff --git a/board/boundary/nitrogen6x/6x_upgrade.txt b/board/boundary/nitrogen6x/6x_upgrade.txt index de73ec6979..f5cf834025 100644 --- a/board/boundary/nitrogen6x/6x_upgrade.txt +++ b/board/boundary/nitrogen6x/6x_upgrade.txt @@ -1,7 +1,11 @@ +if itest.s a$bootfile == a; then + bootfile=u-boot.imx +fi + setenv stdout serial,vga echo "check U-Boot" ; setenv offset 0x400 -if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then +if ${fs}load ${dtype} ${disk}:1 12000000 $bootfile || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then echo "read $filesize bytes from SD card" ; if sf probe || sf probe || \ sf probe 1 27000000 || sf probe 1 27000000 ; then diff --git a/board/boundary/oc/6x_upgrade.txt b/board/boundary/oc/6x_upgrade.txt deleted file mode 100644 index ad3d0b62c1..0000000000 --- a/board/boundary/oc/6x_upgrade.txt +++ /dev/null @@ -1,45 +0,0 @@ -setenv stdout serial,vga -echo "check U-Boot" ; -setenv offset 0x400 -if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then - echo "read $filesize bytes from SD card" ; - if sf probe || sf probe || \ - sf probe 1 27000000 || sf probe 1 27000000 ; then - echo "probed SPI ROM" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - echo "------- U-Boot versions match" ; - else - echo "Need U-Boot upgrade" ; - echo "Program in 5 seconds" ; - for n in 5 4 3 2 1 ; do - echo $n ; - sleep 1 ; - done - echo "erasing" ; - sf erase 0 0xC0000 ; - # two steps to prevent bricking - echo "programming" ; - sf write 0x12000000 $offset $filesize ; - echo "verifying" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - while echo "---- U-Boot upgraded. reset" ; do - sleep 120 - done - else - echo "Read verification error" ; - fi - else - echo "Error re-reading EEPROM" ; - fi - fi - else - echo "Error reading boot loader from EEPROM" ; - fi - else - echo "Error initializing EEPROM" ; - fi ; -else - echo "No U-Boot image found on SD card" ; -fi |