diff --git a/boards.sh b/boards.sh index c8aaa0e3a9..53b800f9e9 100644 --- a/boards.sh +++ b/boards.sh @@ -28,33 +28,11 @@ install_board_specific (){ rm -rf $CACHEDIR/sdcard/boot/dtb.old # remove .old on new image - if [[ $BOARD == udoo* ]] ; then - cp $SRC/lib/config/boot-$BOARD.cmd $CACHEDIR/sdcard/boot/boot.cmd - elif [[ $BOARD == cubox-i* ]]; then - cp $SRC/lib/config/boot-cubox.cmd $CACHEDIR/sdcard/boot/boot.cmd - elif [[ $BOARD == guitar* ]]; then - cp $SRC/lib/config/boot-guitar.cmd $CACHEDIR/sdcard/boot/boot.cmd - elif [[ $BOARD == roseapple* ]]; then - cp $SRC/lib/config/boot-roseapple.cmd $CACHEDIR/sdcard/boot/boot.cmd - elif [[ $BOARD == armada* ]]; then - cp $SRC/lib/config/boot-marvell.cmd $CACHEDIR/sdcard/boot/boot.cmd - elif [[ $BOARD == odroidxu4 ]]; then - cp $SRC/lib/config/boot-odroid-xu4.ini $CACHEDIR/sdcard/boot/boot.ini - elif [[ $BOARD == odroidc1 ]]; then - cp $SRC/lib/config/boot-odroid-c1.ini $CACHEDIR/sdcard/boot/boot.ini - elif [[ $BOARD == odroidc2 ]]; then - cp $SRC/lib/config/boot-odroid-c2.ini $CACHEDIR/sdcard/boot/boot.ini - elif [[ $BOARD == pine64* ]]; then - cp $SRC/lib/config/boot-pine64.cmd $CACHEDIR/sdcard/boot/boot.cmd - else - cp $SRC/lib/config/boot.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 - # let's prepare for old kernel too - #chroot $CACHEDIR/sdcard /bin/bash -c \ - #"ln -s /boot/bin/$BOARD.bin /boot/script.bin >/dev/null 2>&1 || cp /boot/bin/$BOARD.bin /boot/script.bin" - fi + [[ $(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 @@ -64,7 +42,7 @@ install_board_specific (){ 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 + sed -e 's/console=tty1 //g' -i $CACHEDIR/sdcard/boot/boot.cmd fi # convert to uboot compatible script diff --git a/build-all.sh b/build-all.sh index a6a170c1a7..939efd6d01 100644 --- a/build-all.sh +++ b/build-all.sh @@ -100,7 +100,7 @@ n=0 for line in "${buildlist[@]}"; do unset LINUXFAMILY LINUXCONFIG LINUXKERNEL LINUXSOURCE KERNELBRANCH BOOTLOADER BOOTSOURCE BOOTBRANCH ARCH UBOOT_NEEDS_GCC KERNEL_NEEDS_GCC \ CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \ - write_uboot_platform family_tweaks UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER UBOOT_TARGET + write_uboot_platform family_tweaks install_boot_script UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER UBOOT_TARGET read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line n=$[$n+1] diff --git a/config/boot-udoo-next.cmd b/config/boot-udoo-next.cmd deleted file mode 100644 index 209adbef21..0000000000 --- a/config/boot-udoo-next.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootargs root=/dev/mmcblk0p1 rootfstype=ext4 rootwait console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 ahci_imx.hotplug=1 quiet loglevel=1 -ext2load mmc 0 0x18000000 /boot/dtb/imx6q-udoo.dtb -ext2load mmc 0 0x12000000 /boot/zImage -bootz 0x12000000 - 0x18000000 -# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr \ No newline at end of file diff --git a/config/boot-cubox.cmd b/config/bootscripts/boot-cubox.cmd similarity index 100% rename from config/boot-cubox.cmd rename to config/bootscripts/boot-cubox.cmd diff --git a/config/boot-guitar.cmd b/config/bootscripts/boot-guitar.cmd similarity index 100% rename from config/boot-guitar.cmd rename to config/bootscripts/boot-guitar.cmd diff --git a/config/boot-marvell.cmd b/config/bootscripts/boot-marvell.cmd similarity index 100% rename from config/boot-marvell.cmd rename to config/bootscripts/boot-marvell.cmd diff --git a/config/boot-odroid-c1.ini b/config/bootscripts/boot-odroid-c1.ini similarity index 100% rename from config/boot-odroid-c1.ini rename to config/bootscripts/boot-odroid-c1.ini diff --git a/config/boot-odroid-c2.ini b/config/bootscripts/boot-odroid-c2.ini similarity index 100% rename from config/boot-odroid-c2.ini rename to config/bootscripts/boot-odroid-c2.ini diff --git a/config/boot-odroid-xu4.ini b/config/bootscripts/boot-odroid-xu4.ini similarity index 100% rename from config/boot-odroid-xu4.ini rename to config/bootscripts/boot-odroid-xu4.ini diff --git a/config/boot-pine64.cmd b/config/bootscripts/boot-pine64.cmd similarity index 100% rename from config/boot-pine64.cmd rename to config/bootscripts/boot-pine64.cmd diff --git a/config/boot-roseapple.cmd b/config/bootscripts/boot-roseapple.cmd similarity index 100% rename from config/boot-roseapple.cmd rename to config/bootscripts/boot-roseapple.cmd diff --git a/config/boot.cmd b/config/bootscripts/boot-sunxi.cmd similarity index 100% rename from config/boot.cmd rename to config/bootscripts/boot-sunxi.cmd diff --git a/config/boot-udoo-neo.cmd b/config/bootscripts/boot-udoo-neo.cmd similarity index 100% rename from config/boot-udoo-neo.cmd rename to config/bootscripts/boot-udoo-neo.cmd diff --git a/config/boot-udoo.cmd b/config/bootscripts/boot-udoo.cmd similarity index 100% rename from config/boot-udoo.cmd rename to config/bootscripts/boot-udoo.cmd diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf index e05595d3fd..251b1ca439 100644 --- a/config/sources/cubox.conf +++ b/config/sources/cubox.conf @@ -49,3 +49,8 @@ family_tweaks() install -m 755 $SRC/lib/scripts/brcm4330-patch $CACHEDIR/sdcard/etc/init.d/brcm4330-patch #chroot $CACHEDIR/sdcard /bin/bash -c "LC_ALL=C LANG=C update-rc.d brcm4330-patch defaults>> /dev/null" } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-cubox.cmd $CACHEDIR/sdcard/boot/boot.cmd +} diff --git a/config/sources/marvell.conf b/config/sources/marvell.conf index d43eb4d444..2abf0bcfa6 100644 --- a/config/sources/marvell.conf +++ b/config/sources/marvell.conf @@ -41,3 +41,8 @@ family_tweaks() { chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1" } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-marvell.cmd $CACHEDIR/sdcard/boot/boot.cmd +} diff --git a/config/sources/neo.conf b/config/sources/neo.conf index 61e16c87d5..2b8d9b1be4 100644 --- a/config/sources/neo.conf +++ b/config/sources/neo.conf @@ -36,3 +36,8 @@ family_tweaks() cp $SRC/lib/bin/udoo-neo-debs/udooneo-bluetooth_1.2-1_armhf.deb $CACHEDIR/sdcard/tmp chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1" } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-udoo-neo.cmd $CACHEDIR/sdcard/boot/boot.cmd +} diff --git a/config/sources/odroidc1.conf b/config/sources/odroidc1.conf index d7989d4c48..82faf4f03f 100644 --- a/config/sources/odroidc1.conf +++ b/config/sources/odroidc1.conf @@ -42,3 +42,8 @@ family_tweaks() echo "/etc/c1_init.sh" >> $CACHEDIR/sdcard/etc/rc.local echo "exit 0" >> $CACHEDIR/sdcard/etc/rc.local } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-odroid-c1.ini $CACHEDIR/sdcard/boot/boot.ini +} diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf index a28a364667..d72ad9a33d 100644 --- a/config/sources/odroidc2.conf +++ b/config/sources/odroidc2.conf @@ -38,3 +38,8 @@ family_tweaks() echo "/etc/c2_init.sh" >> $CACHEDIR/sdcard/etc/rc.local echo "exit 0" >> $CACHEDIR/sdcard/etc/rc.local } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-odroid-c2.ini $CACHEDIR/sdcard/boot/boot.ini +} diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf index 665b692412..95ad09fc7d 100644 --- a/config/sources/odroidxu4.conf +++ b/config/sources/odroidxu4.conf @@ -40,3 +40,8 @@ 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" } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-odroid-xu4.ini $CACHEDIR/sdcard/boot/boot.ini +} diff --git a/config/sources/pine64.conf b/config/sources/pine64.conf index a41f4e147f..53b2f404a4 100644 --- a/config/sources/pine64.conf +++ b/config/sources/pine64.conf @@ -42,3 +42,8 @@ write_uboot_platform() cp $1/pine64.dtb /boot fi } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-pine64.cmd $CACHEDIR/sdcard/boot/boot.cmd +} diff --git a/config/sources/s500.conf b/config/sources/s500.conf index e25cc3c167..a7335291b4 100644 --- a/config/sources/s500.conf +++ b/config/sources/s500.conf @@ -44,3 +44,8 @@ family_tweaks() printf "blacklist gsensor_mir3da\nblacklist gsensor_stk8313\nblacklist gsensor_bma222\nblacklist lightsensor_ltr301\n" >> $CACHEDIR/sdcard/etc/modprobe.d/blacklist-guitar.conf gzip < $SRC/lib/bin/armbian-u-boot.bmp > $CACHEDIR/sdcard/boot/boot_logo.bmp.gz } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-$BOARD.cmd $CACHEDIR/sdcard/boot/boot.cmd +} diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc index b883ca497f..c4f60ae1b1 100644 --- a/config/sources/sunxi_common.inc +++ b/config/sources/sunxi_common.inc @@ -37,3 +37,8 @@ family_tweaks() 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 +} diff --git a/config/sources/toradex.conf b/config/sources/toradex.conf.disabled similarity index 65% rename from config/sources/toradex.conf rename to config/sources/toradex.conf.disabled index 4b103daac1..592400ce23 100644 --- a/config/sources/toradex.conf +++ b/config/sources/toradex.conf.disabled @@ -15,5 +15,10 @@ UBOOT_FILES="" write_uboot_platform() { - + display_alert "Function not implemented" "write_uboot_platform" "wrn" +} + +install_boot_script() +{ + display_alert "Function not implemented" "install_boot_script" "wrn" } diff --git a/config/sources/udoo.conf b/config/sources/udoo.conf index f1dc03b32c..ce6838a805 100644 --- a/config/sources/udoo.conf +++ b/config/sources/udoo.conf @@ -36,3 +36,8 @@ family_tweaks() sed 's/wlan0/wlan2/' -i $CACHEDIR/sdcard/etc/network/interfaces.bonding sed 's/wlan0/wlan2/' -i $CACHEDIR/sdcard/etc/network/interfaces.hostapd } + +install_boot_script() +{ + cp $SRC/lib/config/bootscripts/boot-udoo.cmd $CACHEDIR/sdcard/boot/boot.cmd +}