diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-03-24 09:00:32 -0700 |
|---|---|---|
| committer | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-06-17 12:04:13 -0700 |
| commit | b53dc07e79138ed949c895adc7e7bce060ac1e1f (patch) | |
| tree | 5b3e6f13d40b53cb257ab959a78c593b0cf60dee | |
| parent | 5f5afad2b7b33c66890fcadcf20b296983d35b13 (diff) | |
6x_bootscript_android: fix fbmem argument
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | board/boundary/nitrogen6x/6x_bootscript_android.txt | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/board/boundary/nitrogen6x/6x_bootscript_android.txt b/board/boundary/nitrogen6x/6x_bootscript_android.txt index 0982cf8054..acc6de0f89 100644 --- a/board/boundary/nitrogen6x/6x_bootscript_android.txt +++ b/board/boundary/nitrogen6x/6x_bootscript_android.txt @@ -1,17 +1,14 @@ -${dtype} dev ${disk} - setenv bootargs enable_wait_mode=off setenv nextcon 0; setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 ; i2c dev 2 - if i2c probe 0x04 ; then setenv bootargs $bootargs video=mxcfb${nextcon}:dev=ldb,LDB-XGA,if=RGB666 if test "0" -eq $nextcon; then - setenv fbcon "fbcon=10M"; + setenv fbmem "fbmem=10M"; else - setenv fbcon ${fbcon},10M + setenv fbmem ${fbmem},10M fi setexpr nextcon $nextcon + 1 else @@ -21,9 +18,9 @@ fi if i2c probe 0x38 ; then setenv bootargs $bootargs video=mxcfb${nextcon}:dev=ldb,1024x600M@60,if=RGB666 if test "0" -eq $nextcon; then - setenv fbcon "fbcon=10M"; + setenv fbmem "fbmem=10M"; else - setenv fbcon ${fbcon},10M + setenv fbmem ${fbmem},10M fi setexpr nextcon $nextcon + 1 else @@ -33,9 +30,9 @@ fi if i2c probe 0x48 ; then setenv bootargs $bootargs video=mxcfb${nextcon}:dev=lcd,CLAA-WVGA,if=RGB666 tsdev=tsc2004 calibration if test "0" -eq $nextcon; then - setenv fbcon "fbcon=10M"; + setenv fbmem "fbmem=10M"; else - setenv fbcon ${fbcon},10M + setenv fbmem ${fbmem},10M fi setexpr nextcon $nextcon + 1 else @@ -45,9 +42,9 @@ fi if hdmidet ; then setenv bootargs $bootargs video=mxcfb${nextcon}:dev=hdmi,1280x720M@60,if=RGB24 if test "0" -eq $nextcon; then - setenv fbcon "fbcon=28M"; + setenv fbmem "fbmem=28M"; else - setenv fbcon ${fbcon},28M + setenv fbmem ${fbmem},28M fi setexpr nextcon $nextcon + 1 else @@ -59,6 +56,6 @@ while test "3" -ne $nextcon ; do setexpr nextcon $nextcon + 1 ; done -setenv bootargs $bootargs fbcon=$fbcon +setenv bootargs $bootargs $fbmem ${fs}load ${dtype} ${disk}:1 10800000 uImage && ${fs}load ${dtype} ${disk}:1 12800000 uramdisk.img && bootm 10800000 12800000 echo "Error loading kernel image" |