From c6af5d031f6c5529f1e5de0c9a49b5518ec54613 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 17 Jul 2016 23:10:11 +0200 Subject: solidrun-imx6: allow to bootup 4.6.x --- package/u-boot/files/boot.script.imx6 | 6 +++--- target/arm/kernel/solidrun-imx6 | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/u-boot/files/boot.script.imx6 b/package/u-boot/files/boot.script.imx6 index 855f0bc8f..24d1b2a93 100644 --- a/package/u-boot/files/boot.script.imx6 +++ b/package/u-boot/files/boot.script.imx6 @@ -1,4 +1,4 @@ -setenv bootargs console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 -ext4load mmc 0:1 0x42000000 boot/${fdtfile} +setenv bootargs 'console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 root=/dev/mmcblk0p1' +ext4load mmc 0:1 0x18000000 boot/${fdtfile} ext4load mmc 0:1 0x10800000 boot/kernel -bootz 0x10800000 - 0x42000000 +bootz 0x10800000 - 0x18000000 diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6 index 093090111..af4888d09 100644 --- a/target/arm/kernel/solidrun-imx6 +++ b/target/arm/kernel/solidrun-imx6 @@ -11,4 +11,3 @@ CONFIG_KUSER_HELPERS=y CONFIG_PCI_IMX6=y CONFIG_PM_SLEEP=y CONFIG_ATAGS=y -CONFIG_CMDLINE_FORCE=y -- cgit v1.2.3