Cleanup for several boot scripts

Parameters like "selinux" and "enforcing" should not be set by default
This commit is contained in:
zador-blood-stained 2017-03-04 21:23:53 +03:00
parent 83cf735604
commit 0f898f3f31
7 changed files with 7 additions and 7 deletions

View File

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

View File

@ -26,7 +26,7 @@ if ext4load ${boot_interface} 0:1 ${loadaddr} /boot/armbianEnv.txt || ext4load $
env import -t ${loadaddr} ${filesize}
fi
setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=${rootfstype} ubootdev=${boot_interface} selinux=0 cgroup_disable=memory scandelay loglevel=${verbosity} ${extraargs}"
setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=${rootfstype} ubootdev=${boot_interface} cgroup_disable=memory scandelay loglevel=${verbosity} ${extraargs}"
ext4load ${boot_interface} 0:1 ${fdt_addr} boot/dtb/${fdtfile} || ext4load ${boot_interface} 0:1 ${fdt_addr} dtb/${fdtfile}
ext4load ${boot_interface} 0:1 ${ramdisk_addr_r} boot/uInitrd || ext4load ${boot_interface} 0:1 ${ramdisk_addr_r} uInitrd

View File

@ -81,7 +81,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=${rootdev} rootwait ro ${condev} rootfstype=${rootfstype} loglevel=1 no_console_suspend consoleblank=0 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}"
setenv bootargs "root=${rootdev} rootwait rw ${condev} rootfstype=${rootfstype} loglevel=1 no_console_suspend consoleblank=0 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
ext4load mmc 0:1 0x21000000 /boot/uImage || fatload mmc 0:1 0x21000000 uImage || ext4load mmc 0:1 0x21000000 uImage

View File

@ -12,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=${rootdev} rootwait ro fsck.repair=yes"
setenv bootrootfs "console=tty1 loglevel=1 root=${rootdev} rootwait rw fsck.repair=yes"
# boot parameter for serial console
# console=ttySAC2,115200n8

View File

@ -21,7 +21,7 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttySAC2,115200n8"; fi
setenv bootargs "${consoleargs} root=${rootdev} rootfstype=${rootfstype} rootwait earlyprintk panic=10 consoleblank=0 loglevel=${verbosity} ${extraargs}"
setenv bootargs "${consoleargs} root=${rootdev} rootfstype=${rootfstype} rootwait panic=10 consoleblank=0 loglevel=${verbosity} ${extraargs}"
# Environment variables to be defined before load (in includes files uboot/.../exy*.h):
# platform dependent: boardname, fdtfile

View File

@ -16,7 +16,7 @@ if load ${devtype} ${devnum}:1 ${ramdisk_addr_r} /boot/armbianEnv.txt || load ${
env import -t ${ramdisk_addr_r} ${filesize}
fi
setenv bootargs "consoleblank=0 selinux=0 scandelay root=${rootdev} rw console=${console} rootfstype=ext4 loglevel=${verbosity} rootwait ${extraargs}"
setenv bootargs "consoleblank=0 scandelay root=${rootdev} rw console=${console} rootfstype=ext4 loglevel=${verbosity} rootwait ${extraargs}"
ext4load ${devtype} ${devnum}:1 ${fdt_addr_r} /boot/dtb/${fdt_file} || fatload ${devtype} ${devnum}:1 ${fdt_addr_r} dtb/${fdt_file} || ext4load ${devtype} ${devnum}:1 ${fdt_addr_r} dtb/${fdt_file}
ext4load ${devtype} ${devnum}:1 ${ramdisk_addr_r} /boot/uInitrd || fatload ${devtype} ${devnum}:1 ${ramdisk_addr_r} uInitrd || ext4load ${devtype} ${devnum}:1 ${ramdisk_addr_r} uInitrd
ext4load ${devtype} ${devnum}:1 ${kernel_addr_r} /boot/zImage || fatload ${devtype} ${devnum}:1 ${kernel_addr_r} zImage || ext4load ${devtype} ${devnum}:1 ${kernel_addr_r} zImage

View File

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