From 657a945b89d7c7a88f07d3b73b47fc61406d14f5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Mar 2015 16:29:09 -0500 Subject: add some useful bits and bytes for rpi2 support --- scripts/install.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/install.sh b/scripts/install.sh index d38ffe94a..7df634213 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -142,7 +142,7 @@ tgt=$2 src=$3 case $target { -(raspberry-pi|solidrun-imx6|default) ;; +(raspberry-pi|raspberry-pi2|solidrun-imx6|default) ;; (*) print -u2 "Unknown target '$target', exiting" exit 1 ;; @@ -165,7 +165,7 @@ case $ostype { basedev=$tgt rootpart=${basedev}s1 datapart=${basedev}s2 - if [[ $target = raspberry-pi ]]; then + if [[ $target = raspberry-pi || $target = raspberry-pi2 ]]; then bootpart=${basedev}s1 rootpart=${basedev}s2 datapart=${basedev}s3 @@ -192,7 +192,7 @@ case $ostype { basedev=$tgt rootpart=${basedev}1 datapart=${basedev}2 - if [[ $target = raspberry-pi ]]; then + if [[ $target = raspberry-pi || $target = raspberry-pi2 ]]; then bootpart=${basedev}1 rootpart=${basedev}2 datapart=${basedev}3 @@ -256,7 +256,7 @@ syspartno=0 # data - flexible (parameter) # system - everything else -if [[ $target = raspberry-pi ]]; then +if [[ $target = raspberry-pi || $target = raspberry-pi2 ]]; then syspartno=1 bootfssz=100 if (( grub )); then @@ -313,7 +313,7 @@ fi #(( partofs = ((coreendsec / secs) + 1) * secs )) # we just use 2048 all the time, since some loaders are longer partofs=2048 -if [[ $target = raspberry-pi ]]; then +if [[ $target = raspberry-pi || $target = raspberry-pi2 ]]; then (( spartofs = partofs + (100 * 2048) )) else spartofs=$partofs @@ -424,7 +424,7 @@ if (( datafssz )); then dd of="$T/firsttrack" conv=notrunc bs=1 seek=$((0x1CE)) 2>/dev/null fi -if [[ $target = raspberry-pi ]]; then +if [[ $target = raspberry-pi || $target = raspberry-pi2 ]]; then # move system and data partition from #0/#1 to #1/#2 dd if="$T/firsttrack" bs=1 skip=$((0x1BE)) count=32 of="$T/x" 2>/dev/null dd of="$T/firsttrack" conv=notrunc bs=1 seek=$((0x1CE)) if="$T/x" 2>/dev/null @@ -503,7 +503,7 @@ case $target { dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 > /dev/null 2>&1 dd if="$fwdir/u-boot.img" of="$tgt" bs=1024 seek=42 > /dev/null 2>&1 ;; -(raspberry-pi) +(raspberry-pi|raspberry-pi2) (( noformat )) || create_fs "$bootpart" ADKBOOT vfat ;; } @@ -520,7 +520,7 @@ if (( datafssz )); then ((keep)) || create_fs "$datapart" ADKDATA ext4 ((keep)) || tune_fs "$datapart" case $target { - (raspberry-pi) + (raspberry-pi|raspberry-pi2) echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >> "$R"/etc/fstab ;; (solidrun-imx6) @@ -530,7 +530,7 @@ if (( datafssz )); then fi case $target { -(raspberry-pi) +(raspberry-pi|raspberry-pi2) mount_fs "$bootpart" "$B" vfat for x in "$R"/boot/*; do [[ -e "$x" ]] && mv -f "$R"/boot/* "$B/" -- cgit v1.2.3