Put boot script name and root device into variables

This commit is contained in:
zador-blood-stained 2016-10-10 19:35:12 +03:00
parent 9547552f22
commit 06ca8c8d9d
26 changed files with 72 additions and 87 deletions

View File

@ -107,7 +107,7 @@ n=0
for line in "${buildlist[@]}"; do
unset LINUXFAMILY LINUXCONFIG KERNELDIR KERNELSOURCE KERNELBRANCH BOOTDIR 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 install_boot_script UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER UBOOT_TARGET \
write_uboot_platform family_tweaks BOOTSCRIPT UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER UBOOT_TARGET \
MODULES MODULES_NEXT INITRD_ARCH
read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line

View File

@ -1,6 +1,9 @@
setenv rootdev "/dev/mmcblk0p1"
run autodetectfdt
setenv ramdisk_addr 0x14800000
setenv bootargs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait console=ttymxc0,115200 console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 consoleblank=0 vt.global_cursor_default=0 quiet loglevel=3"
setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait console=ttymxc0,115200 console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 consoleblank=0 vt.global_cursor_default=0 quiet loglevel=3 ${extraargs}"
ext2load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} /dtb/${fdt_file} || ext4load mmc 0 ${fdt_addr} /dtb/${fdt_file}
ext2load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd
ext2load mmc 0 ${loadaddr} /boot/zImage || fatload mmc 0 ${loadaddr} zImage || ext4load mmc 0 ${loadaddr} zImage

View File

@ -1,5 +1,9 @@
setenv rootdev "/dev/mmcblk0p2"
# console=ttyS3 # serial
setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=tty1 rootfstype=ext4 loglevel=1 rootwait"
setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=${rootdev} rw console=tty1 rootfstype=ext4 loglevel=1 rootwait ${extraargs}"
setenv os_type linux
fatload mmc 0:1 ${fdt_addr_r} dtb/lemaker_guitar_bbb.dtb
fatload mmc 0:1 ${ramdisk_addr_r} uInitrd

View File

@ -1,3 +1,6 @@
setenv rootdev "/dev/mmcblk0p1"
if ext4load mmc 0:1 0x00000000 /boot/.verbose
then
setenv verbosity 7
@ -16,7 +19,7 @@ setenv eth1addr 00:50:43:25:fb:84
setenv eth2addr 00:50:43:84:25:2f
setenv eth3addr 00:50:43:0d:19:18
#
setenv bootargs "selinux=0 cgroup_disable=memory scandelay root=/dev/mmcblk0p1 rw rootfstype=ext4 console=ttyS0,115200 loglevel=${verbosity} rootwait"
setenv bootargs "selinux=0 cgroup_disable=memory scandelay root=${rootdev} rw rootfstype=ext4 console=ttyS0,115200 loglevel=${verbosity} rootwait ${extraargs}"
ext2load mmc 0:1 ${fdtaddr} boot/dtb/armada-388-clearfog.dtb
ext2load mmc 0:1 ${ramdiskaddr} boot/uInitrd
ext2load mmc 0:1 ${loadaddr} boot/zImage

View File

@ -1,5 +1,7 @@
ODROIDC-UBOOT-CONFIG
setenv rootdev "/dev/mmcblk0p2"
# Possible screen resolutions
# Uncomment only a single Line! The line with setenv written.
# At least one mode must be selected.
@ -78,7 +80,7 @@ if test "${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi
if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
# Boot Arguments
setenv bootargs "root=/dev/mmcblk0p2 rootwait ro ${condev} loglevel=1 no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac}"
setenv bootargs "root=${rootdev} rootwait ro ${condev} loglevel=1 no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} ${extraargs}"
# Booting
fatload mmc 0:1 0x21000000 uImage

View File

@ -1,5 +1,7 @@
ODROIDC2-UBOOT-CONFIG
setenv rootdev "/dev/mmcblk0p2"
# Possible screen resolutions
# Uncomment only a single Line! The line with setenv written.
# At least one mode must be selected.
@ -113,7 +115,7 @@ setenv condev "console=ttyS0,115200n8 console=tty0 consoleblank=0" # on both
setenv verbosity "1"
# Boot Arguments
setenv bootargs "root=/dev/mmcblk0p2 rootwait rootflags=data=writeback rw ${condev} no_console_suspend hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes loglevel=${verbosity} net.ifnames=0"
setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw ${condev} no_console_suspend hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes loglevel=${verbosity} net.ifnames=0 ${extraargs}"
# Booting

View File

@ -1,5 +1,7 @@
ODROIDXU-UBOOT-CONFIG
setenv rootdev "/dev/mmcblk0p2"
# U-Boot Parameters
setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff"
@ -10,7 +12,7 @@ setenv macaddr "00:1e:06:61:7a:55
#------------------------------------------------------------------------------------------------------
# Basic Ubuntu Setup. Don't touch unless you know what you are doing.
# --------------------------------
setenv bootrootfs "console=tty1 loglevel=1 root=/dev/mmcblk0p2 rootwait ro fsck.repair=yes"
setenv bootrootfs "console=tty1 loglevel=1 root=${rootdev} rootwait ro fsck.repair=yes"
# boot parameter for serial console
# console=ttySAC2,115200n8
@ -193,7 +195,7 @@ setenv hdmi_tx_res "0"
setenv hdmi_phy_control "hdmi_tx_amp_lvl=${hdmi_tx_amp_lvl} hdmi_tx_lvl_ch0=${hdmi_tx_lvl_ch0} hdmi_tx_lvl_ch1=${hdmi_tx_lvl_ch1} hdmi_tx_lvl_ch2=${hdmi_tx_lvl_ch2} hdmi_tx_emp_lvl=${hdmi_tx_emp_lvl} hdmi_clk_amp_lvl=${hdmi_clk_amp_lvl} hdmi_tx_res=${hdmi_tx_res} HPD=${HPD} vout=${vout}"
# final boot args
setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control}"
setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control} ${extraargs}"
# drm.debug=0xff
# Boot the board
boot

View File

@ -1,3 +1,6 @@
setenv rootdev "/dev/mmcblk1p1"
# a boot script for U-Boot / Odroid XU4
#
# It requires a list of environment variables to be defined before load (in includes files uboot/.../exy*.h):
@ -11,9 +14,7 @@ setenv ftdaddr 0x44000000
setenv consolecfg "console=tty1 console=ttySAC2,115200n8"
setenv rootfs "/dev/mmcblk1p1"
setenv bootargs "${consolecfg} root=${rootfs} rootfstype=${rootfstype} rootwait rw earlyprintk ${opts}";
setenv bootargs "${consolecfg} root=${rootdev} rootfstype=${rootfstype} rootwait rw earlyprintk ${opts}";
load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} /boot/zImage;
load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} /boot/uInitrd;
load mmc ${mmcbootdev}:${mmcbootpart} ${ftdaddr} /boot/dtb/exynos5422-odroidxu4.dtb;

View File

@ -1,4 +1,6 @@
setenv rootdev "/dev/mmcblk0p1"
if ext4load mmc 0 0x00000000 /boot/.next || fatload mmc 0 0x00000000 .next || ext4load mmc 0 0x00000000 .next; then
setenv bootargs "console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait rootfstype=ext4 panic=10 consoleblank=0 enforcing=0 loglevel=1"
ext4load mmc 0 ${fdt_addr_r} /boot/dtb/allwinner/${fdtfile} || fatload mmc 0 ${fdt_addr_r} /dtb/allwinner/${fdtfile} || ext4load mmc 0 ${fdt_addr_r} /dtb/allwinner/${fdtfile}
@ -6,7 +8,7 @@ if ext4load mmc 0 0x00000000 /boot/.next || fatload mmc 0 0x00000000 .next || ex
ext4load mmc 0 ${kernel_addr_r} /boot/Image || fatload mmc 0 ${kernel_addr_r} Image || ext4load mmc 0 ${kernel_addr_r} Image
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
else
setenv bootargs "console=ttyS0,115200n8 no_console_suspend earlycon=uart,mmio32,0x01c28000 mac_addr=${ethaddr} root=/dev/mmcblk0p1 rootwait panic=10 consoleblank=0 enforcing=0 loglevel=2"
setenv bootargs "console=ttyS0,115200n8 no_console_suspend earlycon=uart,mmio32,0x01c28000 mac_addr=${ethaddr} root=${rootdev} rootwait panic=10 consoleblank=0 enforcing=0 loglevel=2 ${extraargs}"
ext4load mmc 0 ${fdt_addr} /boot/${pine64_model}.dtb || fatload mmc 0 ${fdt_addr} ${pine64_model}.dtb || ext4load mmc 0 ${fdt_addr} ${pine64_model}.dtb
ext4load mmc 0 ${initrd_addr} /boot/uInitrd || fatload mmc 0 ${initrd_addr} uInitrd || ext4load mmc 0 ${initrd_addr} uInitrd || setenv initrd_addr "-"
ext4load mmc 0 ${kernel_addr} /boot/Image || fatload mmc 0 ${kernel_addr} Image || ext4load mmc 0 ${kernel_addr} Image

View File

@ -1,5 +1,8 @@
setenv rootdev "/dev/mmcblk0p2"
setenv fdt_high "0xffffffff"
setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=tty1 rootfstype=ext4 loglevel=1 rootwait"
setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=${rootdev} rw console=tty1 rootfstype=ext4 loglevel=1 rootwait ${extraargs}"
fatload mmc 0:1 ${fdt_addr_r} dtb/actduino_bubble_gum_sdboot_linux.dtb
fatload mmc 0:1 ${ramdisk_addr_r} uInitrd
fatload mmc 0:1 ${kernel_addr_r} zImage

View File

@ -1,3 +1,6 @@
setenv rootdev "/dev/mmcblk0p1"
if ext4load mmc 0 0x00000000 /boot/.verbose
then
setenv verbosity 7
@ -11,7 +14,7 @@ fi
#saveenv
# nonstandard monitor settings
setenv bootargs "console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait rootfstype=ext4 cgroup_enable=memory swapaccount=1 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} storage_type=${storage_type}"
setenv bootargs "console=ttyS0,115200 console=tty1 root=${rootdev} rootwait rootfstype=ext4 cgroup_enable=memory swapaccount=1 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} storage_type=${storage_type} ${extraargs}"
#--------------------------------------------------------------------------------------------------------------------------------
# Boot loader script to boot with different boot methods for old and new kernel
#--------------------------------------------------------------------------------------------------------------------------------

View File

@ -1,4 +1,7 @@
# imx6sx-udoo-neo-basic.dtb

setenv rootdev "/dev/mmcblk0p1"
# imx6sx-udoo-neo-basic.dtb
# imx6sx-udoo-neo-basic-hdmi.dtb
# imx6sx-udoo-neo-basic-hdmi-m4.dtb
# imx6sx-udoo-neo-basicks.dtb
@ -38,7 +41,7 @@ if test "${board}" = "Neo"; then echo "Booting Neo"; fi
setenv fdt_file imx6sx-udoo-neo-full-m4.dtb
setenv bootargs root=/dev/mmcblk0p1 rootfstype=ext4 rootwait console=ttymxc0,115200 rd.dm=0 rd.luks=0 rd.lvm=0 rw uart_from_osc loglevel=1
setenv "bootargs root=${rootdev} rootfstype=ext4 rootwait console=ttymxc0,115200 rd.dm=0 rd.luks=0 rd.lvm=0 rw uart_from_osc loglevel=1 ${extraargs}"
ext2load mmc ${mmcdev}:${mmcpart} 0x84000000 /boot/bin/m4startup.fw
ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/${image}
ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/dtb/${fdt_file}

View File

@ -1,10 +1,13 @@
setenv rootdev "/dev/mmcblk0p1"
if ext4load mmc 0 0x00000000 /boot/.verbose
then
setenv verbosity 7
else
setenv verbosity 1
fi
setenv bootargs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 quiet loglevel=1 loglevel=${verbosity} consoleblank=0"
setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 quiet loglevel=1 loglevel=${verbosity} consoleblank=0 ${extraargs}"
if ext4load mmc 0 0x00000000 /boot/.next
then
setenv fdt_file imx6q-udoo.dtb

View File

@ -2,6 +2,7 @@
BOOTSOURCE='https://github.com/SolidRun/u-boot-imx6'
BOOTBRANCH='branch:imx6'
BOOTDIR='u-boot-cubox'
BOOTSCRIPT="boot-cubox.cmd:boot.cmd"
UBOOT_NEEDS_GCC='< 5.0'
KERNEL_NEEDS_GCC='< 5.0'
@ -50,11 +51,6 @@ family_tweaks()
cp $SRC/lib/scripts/brcm4330 $CACHEDIR/sdcard/etc/default
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
if [[ $BRANCH == next && -f $CACHEDIR/sdcard/boot/boot.cmd ]]; then
sed -e 's/console=tty1 //g' -i $CACHEDIR/sdcard/boot/boot.cmd
fi

View File

@ -1,6 +1,7 @@
BOOTSOURCE='https://github.com/SolidRun/u-boot-armada38x'
BOOTBRANCH='branch:u-boot-2013.01-15t1-clearfog'
BOOTDIR='u-boot-armada'
BOOTSCRIPT="boot-marvell.cmd:boot.cmd"
UBOOT_NEEDS_GCC='< 5.0'
UBOOT_COMPILER="arm-linux-gnueabi-"
@ -42,8 +43,3 @@ 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
}

View File

@ -4,6 +4,7 @@ BOOTBRANCH='branch:odroidc-v2011.03'
BOOTDIR='u-boot-odroidc1'
UBOOT_NEEDS_GCC='< 4.9'
BOOTSIZE=32
BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"
KERNEL_NEEDS_GCC='< 4.9'
KERNEL_IMAGE_TYPE=uImage
@ -43,8 +44,3 @@ 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
}

View File

@ -4,6 +4,7 @@ BOOTDIR='u-boot-odroidc2'
BOOTSIZE=64
UBOOT_NEEDS_GCC='< 5.0'
UBOOT_TARGET="ARCH=arm"
BOOTSCRIPT="boot-odroid-c2.ini:boot.ini"
KERNELSOURCE='https://github.com/hardkernel/linux'
KERNELBRANCH='branch:odroidc2-3.14.y'
@ -39,8 +40,3 @@ 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
}

View File

@ -1,3 +1,4 @@
BOOTDIR='u-boot-odroidxu'
OFFSET=4
@ -8,6 +9,7 @@ case $BRANCH in
BOOTBRANCH='branch:odroidxu3-v2012.07'
BOOTSIZE=64
UBOOT_FILES="sd_fuse/hardkernel/bl1.bin.hardkernel sd_fuse/hardkernel/bl2.bin.hardkernel u-boot.bin sd_fuse/hardkernel/tzsw.bin.hardkernel"
BOOTSCRIPT="boot-odroid-xu4-default.ini:boot.ini"
KERNELSOURCE='https://github.com/hardkernel/linux'
KERNELBRANCH='branch:odroidxu3-3.10.y'
@ -22,6 +24,7 @@ case $BRANCH in
BOOTSIZE=0
BOOTCONFIG=odroid-xu4_defconfig
UBOOT_FILES="sd_fusing.sh xu4_blobs/bl1.bin.hardkernel xu4_blobs/bl2.bin.hardkernel.1mb_uboot u-boot-dtb.bin xu4_blobs/tzsw.bin.hardkernel"
BOOTSCRIPT="boot-odroid-xu4-next.cmd:boot.cmd"
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
@ -63,12 +66,3 @@ 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()
{
if [[ $BRANCH == next ]] ; then
cp $SRC/lib/config/bootscripts/boot-odroid-xu4-${BRANCH}.cmd $CACHEDIR/sdcard/boot/boot.cmd
else
cp $SRC/lib/config/bootscripts/boot-odroid-xu4-${BRANCH}.ini $CACHEDIR/sdcard/boot/boot.ini
fi
}

View File

@ -1,6 +1,7 @@
BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-pine64-armbian.git'
BOOTDIR='u-boot-pine64'
BOOTSCRIPT="boot-pine64.cmd:boot.cmd"
case $BRANCH in
default)
@ -52,8 +53,3 @@ family_tweaks()
cp $SRC/lib/config/asound.state.pine64-default $CACHEDIR/sdcard/var/lib/alsa/asound.state
fi
}
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-pine64.cmd $CACHEDIR/sdcard/boot/boot.cmd
}

View File

@ -1,6 +1,6 @@
UBOOT_TARGET="u-boot-dtb.img"
BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
BOOTSIZE=32
OFFSET=16
@ -43,8 +43,3 @@ 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
}

View File

@ -39,4 +39,12 @@ family_tweaks()
chroot $CACHEDIR/sdcard /bin/bash -c "systemctl --no-reload enable serial-getty@ttyGS0.service > /dev/null"
echo "ttyGS0" >> $CACHEDIR/sdcard/etc/securetty
fi
if [[ $LINUXFAMILY == sun8i ]]; then
# u-boot default is nonsec. Legacy requires sec, mainline requires nonsec for SMP
local boot_mode=nonsec
[[ $BRANCH == default ]] && boot_mode=sec
sed -i -e "1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode $boot_mode\n/" \
-e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/sdcard/boot/boot.cmd
fi
}

View File

@ -2,6 +2,7 @@
BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
BOOTDIR=$MAINLINE_UBOOT_DIR
BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
case $BRANCH in
default)
@ -24,17 +25,3 @@ write_uboot_platform()
dd if=/dev/zero of=$2 bs=1k count=1023 seek=1 status=noxfer > /dev/null 2>&1
dd if=$1/u-boot-sunxi-with-spl.bin of=$2 bs=1024 seek=8 status=noxfer > /dev/null 2>&1
}
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-sunxi.cmd $CACHEDIR/sdcard/boot/boot.cmd
# orangepi h3 temp exceptions
if [[ $LINUXFAMILY == sun8i ]]; then
# u-boot default is nonsec. Legacy requires sec, mainline requires nonsec for SMP
local boot_mode=nonsec
[[ $BRANCH == default ]] && boot_mode=sec
sed -i -e "1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode $boot_mode\n/" \
-e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/sdcard/boot/boot.cmd
fi
}

View File

@ -19,8 +19,3 @@ write_uboot_platform()
{
display_alert "Function not implemented" "write_uboot_platform" "wrn"
}
install_boot_script()
{
display_alert "Function not implemented" "install_boot_script" "wrn"
}

View File

@ -1,5 +1,6 @@
BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
BOOTDIR='u-boot-udoo'
BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
case $BOARD in
udoo)
@ -58,8 +59,3 @@ family_tweaks()
chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1"
fi
}
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-$BOARD.cmd $CACHEDIR/sdcard/boot/boot.cmd
}

View File

@ -1,5 +1,6 @@
BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
BOOTDIR='u-boot-udoo'
BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
case $BOARD in
udoo)
@ -58,8 +59,3 @@ family_tweaks()
chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1"
fi
}
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-$BOARD.cmd $CACHEDIR/sdcard/boot/boot.cmd
}

View File

@ -66,7 +66,10 @@ install_common()
# display welcome message at first root login
touch $CACHEDIR/sdcard/root/.not_logged_in_yet
[[ $(type -t install_boot_script) == function ]] && install_boot_script
# NOTE: this needs to be executed before family_tweaks
local bootscript_src=${BOOTSCRIPT%%:*}
local bootscript_dst=${BOOTSCRIPT##*:}
cp $SRC/lib/config/bootscripts/$bootscript_src $CACHEDIR/sdcard/boot/$bootscript_dst
# initial date for fake-hwclock
date -u '+%Y-%m-%d %H:%M:%S' > $CACHEDIR/sdcard/etc/fake-hwclock.data