diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 8a963b8..8852b79 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -19,13 +19,12 @@ unset spl_name boot_name="u-boot.imx" #Bootloader: u-boot settings -boot_image="bootm" -USE_UIMAGE=1 -boot_scr_wrapper=1 +boot_image="bootz" boot_script="uEnv.txt" boot_fstype="ext2" -uboot_SCRIPT_ENTRY="loaduimage" -uboot_CMD_LOAD="ext2load" +uboot_USE_MMC_DEFINES=1 +uboot_SCRIPT_ENTRY="uenvcmd" +uboot_CMD_LOAD="load" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx @@ -35,10 +34,11 @@ kernel_repo="STABLE" usbnet_mem= #Kernel: Bootloader Settings: -conf_loadaddr="0x10000000" -conf_initrdaddr="0x12000000" conf_zreladdr="0x10008000" -conf_fdtaddr="0x11ff0000" +conf_loadaddr="0x12000000" +conf_fdtaddr="0x11000000" +#initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB) +conf_initrdaddr="0x12A00000" conf_fdtfile="imx6q-sabrelite.dtb" need_dtbs=1 @@ -51,3 +51,5 @@ VIDEO_CONSOLE="console=tty0" HAS_IMX_BLOB=1 VIDEO_FB="mxcdi1fb" VIDEO_TIMING="RGB24,1280x720M@60" + +conf_note="For bootloader UPGRADE (correct u-boot.imx is in the boot partition) see: http://eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite#i.MX6xSABRELite-Initialboot:UpgradeBootloader" diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index d5cd69a..79b3dc7 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -27,7 +27,7 @@ uboot_CMD_LOAD="load" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx kernel_subarch="imx" -kernel_repo="TESTING" +kernel_repo="STABLE" usbnet_mem= diff --git a/mk_mmc.sh b/mk_mmc.sh index 2e3d88e..81353b5 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1161,7 +1161,6 @@ dd_uboot_boot () { echo "Using dd to place bootloader on drive" echo "-----------------------------" dd if=${TEMPDIR}/dl/${UBOOT} of=${MMC} seek=${dd_uboot_seek} bs=${dd_uboot_bs} - bootloader_installed=1 } dd_spl_uboot_boot () { @@ -1249,11 +1248,6 @@ populate_boot () { if [ "${boot_name}" ] ; then if [ -f ${TEMPDIR}/dl/${UBOOT} ] ; then cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/${boot_name} - fi - fi - - if [ "${boot_name}" ] ; then - if [ -f ${TEMPDIR}/dl/${UBOOT} ] ; then cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/backup/${boot_name} echo "-----------------------------" fi