* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
158 lines
4.2 KiB
Batchfile
158 lines
4.2 KiB
Batchfile
setenv bootargs ''
|
|
|
|
setenv initrd_high 0xffffffff
|
|
m4=''
|
|
kernelimage=zImage
|
|
bootcommand=bootz
|
|
a_base=0x10000000
|
|
if itest.s x51 == "x${imx_cpu}" ; then
|
|
a_base=0x90000000
|
|
elif itest.s x53 == "x${imx_cpu}"; then
|
|
a_base=0x70000000
|
|
elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
|
|
a_base=0x80000000
|
|
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
|
|
a_base=0x40000000
|
|
kernelimage=Image
|
|
bootcommand=booti
|
|
fi
|
|
if itest.s "x1" == "x${m4enabled}" ; then
|
|
run m4boot;
|
|
m4='-m4';
|
|
fi
|
|
|
|
setexpr a_script ${a_base} + 0x00800000
|
|
setexpr a_zImage ${a_base} + 0x00800000
|
|
setexpr a_fdt ${a_base} + 0x03000000
|
|
setexpr a_ramdisk ${a_base} + 0x03800000
|
|
setexpr a_initrd ${a_base} + 0x03a00000
|
|
setexpr a_reset_cause_marker ${a_base} + 0x80
|
|
setexpr a_reset_cause ${a_base} + 0x84
|
|
|
|
if itest.s "x" == "x${board}" ; then
|
|
echo "!!!! Error: Your u-boot is outdated. Please upgrade.";
|
|
exit;
|
|
fi
|
|
|
|
if itest.s "x" == "x${fdt_file}" ; then
|
|
if itest.s x6SOLO == "x${imx_cpu}" ; then
|
|
fdt_file=imx6dl-${board}.dtb;
|
|
elif itest.s x6DL == "x${imx_cpu}" ; then
|
|
fdt_file=imx6dl-${board}.dtb;
|
|
elif itest.s x6QP == "x${imx_cpu}" ; then
|
|
fdt_file=imx6qp-${board}.dtb;
|
|
elif itest.s x6SX == "x${imx_cpu}" ; then
|
|
fdt_file=imx6sx-${board}${m4}.dtb;
|
|
elif itest.s x6ULL == "x${imx_cpu}" ; then
|
|
fdt_file=imx6ull-${board}.dtb;
|
|
elif itest.s x7D == "x${imx_cpu}" ; then
|
|
fdt_file=imx7d-${board}${m4}.dtb;
|
|
elif itest.s x8MQ == "x${imx_cpu}" ; then
|
|
fdt_file=imx8mq-${board}${m4}.dtb;
|
|
elif itest.s x8MM == "x${imx_cpu}" ; then
|
|
fdt_file=imx8mm-${board}${m4}.dtb;
|
|
elif itest.s x8MMQ == "x${imx_cpu}" ; then
|
|
fdt_file=imx8mm-${board}${m4}.dtb;
|
|
elif itest.s x8MNano == "x${imx_cpu}" ; then
|
|
fdt_file=imx8mn-${board}${m4}.dtb;
|
|
elif itest.s x51 == "x${imx_cpu}" ; then
|
|
fdt_file=imx51-${board}.dtb;
|
|
elif itest.s x53 == "x${imx_cpu}" ; then
|
|
fdt_file=imx53-${board}.dtb;
|
|
else
|
|
fdt_file=imx6q-${board}.dtb;
|
|
fi
|
|
fi
|
|
|
|
if itest.s x${distro_bootpart} == x ; then
|
|
distro_bootpart=1
|
|
fi
|
|
|
|
if load ${devtype} ${devnum}:${distro_bootpart} ${a_script} uEnv.txt ; then
|
|
env import -t ${a_script} ${filesize}
|
|
fi
|
|
setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${imx_cpu} board=${board}
|
|
|
|
if load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${prefix}${fdt_file} ; then
|
|
fdt addr ${a_fdt}
|
|
setenv fdt_high 0xffffffff
|
|
else
|
|
echo "!!!! Error loading ${prefix}${fdt_file}";
|
|
exit;
|
|
fi
|
|
|
|
fdt resize 4096
|
|
if itest.s "x" != "x${cmd_board}" ; then
|
|
run cmd_board
|
|
fi
|
|
if itest.s "x" != "x${cmd_custom}" ; then
|
|
run cmd_custom
|
|
fi
|
|
if itest.s "x" != "x${cmd_hdmi}" ; then
|
|
run cmd_hdmi
|
|
if itest.s x != x${allow_noncea} ; then
|
|
setenv bootargs ${bootargs} mxc_hdmi.only_cea=0;
|
|
echo "non-CEA modes allowed on HDMI, audio may be affected";
|
|
fi
|
|
fi
|
|
if itest.s "x" != "x${cmd_lcd}" ; then
|
|
run cmd_lcd
|
|
fi
|
|
if itest.s "x" != "x${cmd_lcd2}" ; then
|
|
run cmd_lcd2
|
|
fi
|
|
if itest.s "x" != "x${cmd_lvds}" ; then
|
|
run cmd_lvds
|
|
fi
|
|
if itest.s "x" != "x${cmd_lvds2}" ; then
|
|
run cmd_lvds2
|
|
fi
|
|
if itest.s "x" != "x${cmd_mipi}" ; then
|
|
run cmd_mipi
|
|
fi
|
|
|
|
if test "sata" = "${devtype}" ; then
|
|
setenv bootargs "${bootargs} root=/dev/sda${distro_bootpart}" ;
|
|
elif test "usb" = "${devtype}" ; then
|
|
setenv bootargs "${bootargs} root=/dev/sda${distro_bootpart}" ;
|
|
else
|
|
setenv bootargs "${bootargs} root=/dev/mmcblk${devnum}p${distro_bootpart}"
|
|
fi
|
|
|
|
if itest.s "x" != "x${disable_msi}" ; then
|
|
setenv bootargs ${bootargs} pci=nomsi
|
|
fi;
|
|
|
|
if itest.s "x" != "x${disable_giga}" ; then
|
|
setenv bootargs ${bootargs} fec.disable_giga=1
|
|
fi
|
|
|
|
if itest.s "x" != "x${wlmac}" ; then
|
|
setenv bootargs ${bootargs} wlcore.mac=${wlmac}
|
|
fi
|
|
|
|
if itest.s "x" != "x${gpumem}" ; then
|
|
setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem}
|
|
fi
|
|
|
|
if itest.s "x" != "x${cma}" ; then
|
|
setenv bootargs ${bootargs} cma=${cma}
|
|
fi
|
|
|
|
if itest.s "x" != "x${loglevel}" ; then
|
|
setenv bootargs ${bootargs} loglevel=${loglevel}
|
|
fi
|
|
|
|
if itest.s "x" != "x${show_fdt}" ; then
|
|
fdt print /
|
|
fi
|
|
|
|
if itest.s "x" != "x${show_env}" ; then
|
|
printenv
|
|
fi
|
|
|
|
if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}${kernelimage} ; then
|
|
${bootcommand} ${a_zImage} - ${a_fdt}
|
|
fi
|
|
echo "Error loading kernel image"
|