enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup in boards.sh

Browse Source
This commit is contained in:
zador-blood-stained 2016-06-22 15:30:01 +03:00
parent 1b580c7785
commit 7c7b046700
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boards.sh
View File

@ -30,10 +30,6 @@ install_board_specific (){
[[ $(type -t install_boot_script) == function ]] && install_boot_script
# orangepi h3 temp exceptions
[[ $LINUXFAMILY == "sun8i" ]] && sed -i -e '1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode sec\n/' \
-e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/sdcard/boot/boot.cmd
# if we have a special fat boot partition, alter rootfs=
if [[ $BOOTSIZE -gt 0 ]]; then
display_alert "Adjusting boot scripts" "$BOARD" "info"
@ -41,14 +37,6 @@ install_board_specific (){
echo "/dev/mmcblk0p1 /boot vfat defaults 0 0" >> $CACHEDIR/sdcard/etc/fstab
fi
if [[ $BOARD == odroidxu4 && $BRANCH == next && -f $CACHEDIR/sdcard/etc/fstab ]] ; then
sed -e 's/mmcblk0/mmcblk1/g' -i $CACHEDIR/sdcard/etc/fstab
fi
if [[ $BOARD == cubox-i && $BRANCH == next && -f $CACHEDIR/sdcard/boot/boot.cmd ]] ; then
sed -e 's/console=tty1 //g' -i $CACHEDIR/sdcard/boot/boot.cmd
fi
# convert to uboot compatible script
[[ -f $CACHEDIR/sdcard/boot/boot.cmd ]] && \
mkimage -C none -A arm -T script -d $CACHEDIR/sdcard/boot/boot.cmd $CACHEDIR/sdcard/boot/boot.scr >> /dev/null

0
config/bootscripts/boot-odroid-xu4.ini → config/bootscripts/boot-odroid-xu4-default.ini
View File

3
config/sources/cubox.conf
View File

@ -53,4 +53,7 @@ family_tweaks()
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-cubox.cmd $CACHEDIR/sdcard/boot/boot.cmd
if [[ $BRANCH == next && -f $CACHEDIR/sdcard/boot/boot.cmd ]]; then
sed -e 's/console=tty1 //g' -i $CACHEDIR/sdcard/boot/boot.cmd
fi
}

15
config/sources/odroidxu4.conf
View File

@ -39,18 +39,13 @@ family_tweaks()
{
echo "blacklist ina231_sensor" > $CACHEDIR/sdcard/etc/modprobe.d/blacklist-odroid.conf
chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
if [[ $BRANCH == next && -f $CACHEDIR/sdcard/etc/fstab ]] ; then
sed -e 's/mmcblk0/mmcblk1/g' -i $CACHEDIR/sdcard/etc/fstab
fi
}
install_boot_script()
{
case $BRANCH in
default)
cp $SRC/lib/config/bootscripts/boot-odroid-xu4.ini $CACHEDIR/sdcard/boot/boot.ini
;;
next)
cp $SRC/lib/config/bootscripts/boot-odroid-xu4-next.ini $CACHEDIR/sdcard/boot/boot.ini
;;
esac
cp $SRC/lib/config/bootscripts/boot-odroid-xu4-${BRANCH}.ini $CACHEDIR/sdcard/boot/boot.ini
}

6
config/sources/sunxi_common.inc
View File

@ -36,9 +36,15 @@ family_tweaks()
sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $CACHEDIR/sdcard/etc/lirc/hardware.conf
cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/sdcard/etc/lirc/lircd.conf
}
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-sunxi.cmd $CACHEDIR/sdcard/boot/boot.cmd
# orangepi h3 temp exceptions
[[ $LINUXFAMILY == sun8i ]] && sed -i -e '1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode sec\n/' \
-e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/sdcard/boot/boot.cmd
}