diff --git a/hwpack/imx6q-nitrogen6x.conf b/hwpack/imx6q-nitrogen6x.conf index f89ef03..897a1ae 100644 --- a/hwpack/imx6q-nitrogen6x.conf +++ b/hwpack/imx6q-nitrogen6x.conf @@ -11,15 +11,15 @@ conf_boot_fstype="ext2" #CONFIG_CMD_BOOTZ #bootz & zImage -uboot_CONFIG_CMD_BOOTZ=1 +uboot_CONFIG_CMD_BOOTZ="enable" #CONFIG_SUPPORT_RAW_INITRD #allows booting un-mkimage wrapped initrds -uboot_CONFIG_SUPPORT_RAW_INITRD=1 +uboot_CONFIG_SUPPORT_RAW_INITRD="enable" #CONFIG_CMD_FS_GENERIC #allows using "load" over "fatload"/"ext2load" -uboot_CONFIG_CMD_FS_GENERIC=1 +uboot_CONFIG_CMD_FS_GENERIC="enable" #can the bootloader auto detect the device: (*.dtb)? #uboot_fdt_auto_detection=1 diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index dc610e0..c53fbf5 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -11,15 +11,15 @@ conf_boot_fstype="fat" #CONFIG_CMD_BOOTZ #bootz & zImage -uboot_CONFIG_CMD_BOOTZ=1 +uboot_CONFIG_CMD_BOOTZ="enable" #CONFIG_SUPPORT_RAW_INITRD #allows booting un-mkimage wrapped initrds -uboot_CONFIG_SUPPORT_RAW_INITRD=1 +uboot_CONFIG_SUPPORT_RAW_INITRD="enable" #CONFIG_CMD_FS_GENERIC #allows using "load" over "fatload"/"ext2load" -uboot_CONFIG_CMD_FS_GENERIC=1 +uboot_CONFIG_CMD_FS_GENERIC="enable" #can the bootloader auto detect the device: (*.dtb)? #uboot_fdt_auto_detection=1 diff --git a/hwpack/tegra124-jetson-tk1.conf b/hwpack/tegra124-jetson-tk1.conf index 94e355b..72ed19e 100644 --- a/hwpack/tegra124-jetson-tk1.conf +++ b/hwpack/tegra124-jetson-tk1.conf @@ -11,15 +11,15 @@ conf_boot_fstype="ext2" #CONFIG_CMD_BOOTZ #bootz & zImage -uboot_CONFIG_CMD_BOOTZ=1 +uboot_CONFIG_CMD_BOOTZ="enable" #CONFIG_SUPPORT_RAW_INITRD #allows booting un-mkimage wrapped initrds -uboot_CONFIG_SUPPORT_RAW_INITRD=1 +uboot_CONFIG_SUPPORT_RAW_INITRD="enable" #CONFIG_CMD_FS_GENERIC #allows using "load" over "fatload"/"ext2load" -uboot_CONFIG_CMD_FS_GENERIC=1 +uboot_CONFIG_CMD_FS_GENERIC="enable" #can the bootloader auto detect the device: (*.dtb)? #uboot_fdt_auto_detection=1 diff --git a/mk_mmc.sh b/mk_mmc.sh index 4dddc95..d6c9c79 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -985,7 +985,7 @@ populate_boot () { if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then touch ${TEMPDIR}/disk/boot/trampoline.uboot - if [ "${uboot_CONFIG_CMD_BOOTZ}" ] ; then + if [ "x${uboot_CONFIG_CMD_BOOTZ}" = "xenable" ] ; then cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net else mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net @@ -1245,7 +1245,7 @@ process_dtb_conf () { esac fi - if [ "${uboot_CONFIG_CMD_BOOTZ}" ] ; then + if [ "x${uboot_CONFIG_CMD_BOOTZ}" = "xenable" ] ; then conf_bootcmd="bootz" conf_normal_kernel_file=zImage conf_net_kernel_file=zImage.net @@ -1257,7 +1257,7 @@ process_dtb_conf () { kernel=/boot/uImage fi - if [ "${uboot_CONFIG_SUPPORT_RAW_INITRD}" ] ; then + if [ "x${uboot_CONFIG_SUPPORT_RAW_INITRD}" = "xenable" ] ; then conf_normal_initrd_file=initrd.img conf_net_initrd_file=initrd.net initrd=/boot/initrd.img-current @@ -1268,7 +1268,7 @@ process_dtb_conf () { initrd=/boot/uInitrd fi - if [ "${uboot_CONFIG_CMD_FS_GENERIC}" ] ; then + if [ "x${uboot_CONFIG_CMD_FS_GENERIC}" = "xenable" ] ; then conf_fileload="load" else if [ "x${conf_boot_fstype}" = "xfat" ] ; then