From mboxrd@z Thu Jan 1 00:00:00 1970 From: York Sun Date: Mon, 6 Nov 2017 20:40:38 +0000 Subject: [U-Boot] [PATCH v2] armv8: ls1088ardb: Add distro boot support References: <1509954568-13497-1-git-send-email-Ashish.Kumar@nxp.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 11/05/2017 11:49 PM, Ashish Kumar wrote: > Distro boot support gives flexibility to run distro RFS like Ubuntu's > being deployed from SD card or SATA drive. If it fails > to detect external storage, fall back to qspi/sd boot. > > Enable this by default in RDB's defconfig by selecting > CONFIG_DISTRO_DEFAULTS > > Signed-off-by: Ashish Kumar > Signed-off-by: Zhang Ying > --- > > v2: > 1. Fix typo in commit msg > 2. Fix indentation > 3. Squash patch-set to one > 4. Remove USB distro option as USB config are > not supported in sd boot defconfig yet. > diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h > index eef9a07..e6bf2b8 100644 > --- a/include/configs/ls1088ardb.h > +++ b/include/configs/ls1088ardb.h > @@ -258,40 +258,102 @@ > > /* Initial environment variables */ > #if defined(CONFIG_QSPI_BOOT) > -#undef CONFIG_EXTRA_ENV_SETTINGS > -#define CONFIG_EXTRA_ENV_SETTINGS \ > - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ > - "loadaddr=0x90100000\0" \ > - "kernel_addr=0x100000\0" \ > - "ramdisk_addr=0x800000\0" \ > - "ramdisk_size=0x2000000\0" \ > - "fdt_high=0xa0000000\0" \ > - "initrd_high=0xffffffffffffffff\0" \ > - "kernel_start=0x1000000\0" \ > - "kernel_load=0xa0000000\0" \ > - "kernel_size=0x2800000\0" \ > +#define MC_INIT_CMD \ > "mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;" \ > - "sf read 0x80100000 0xE00000 0x100000;" \ > - "fsl_mc start mc 0x80000000 0x80100000\0" \ > - "mcmemsize=0x70000000 \0" > + "sf read 0x80100000 0xE00000 0x100000;" \ > + "fsl_mc start mc 0x80000000 0x80100000\0" \ > + "mcmemsize=0x70000000\0" > #elif defined(CONFIG_SD_BOOT) > +#define MC_INIT_CMD \ > + "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \ > + "mmc read 0x80100000 0x7000 0x800;" \ > + "fsl_mc start mc 0x80000000 0x80100000\0" \ > + "mcmemsize=0x70000000\0" > +#endif > + > #undef CONFIG_EXTRA_ENV_SETTINGS > #define CONFIG_EXTRA_ENV_SETTINGS \ > + "BOARD=ls1088ardb\0" \ > "hwconfig=fsl_ddr:bank_intlv=auto\0" \ > - "loadaddr=0x90100000\0" \ > - "kernel_addr=0x800\0" \ > "ramdisk_addr=0x800000\0" \ > "ramdisk_size=0x2000000\0" \ > "fdt_high=0xa0000000\0" \ > "initrd_high=0xffffffffffffffff\0" \ > - "kernel_start=0x8000\0" \ > - "kernel_load=0xa0000000\0" \ > - "kernel_size=0x14000\0" \ > - "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \ > - "mmc read 0x80100000 0x7000 0x800;" \ > - "fsl_mc start mc 0x80000000 0x80100000\0" \ > - "mcmemsize=0x70000000 \0" > - > + "fdt_addr=0x64f00000\0" \ > + "kernel_addr=0x1000000\0" \ > + "kernel_addr_sd=0x8000\0" \ > + "kernel_start=0x580100000\0" \ > + "kernelheader_start=0x580800000\0" \ > + "scriptaddr=0x80000000\0" \ > + "scripthdraddr=0x80080000\0" \ > + "fdtheader_addr_r=0x80100000\0" \ > + "kernelheader_addr=0x800000\0" \ > + "kernelheader_addr_r=0x80200000\0" \ > + "kernel_addr_r=0x81000000\0" \ > + "kernelheader_size=0x40000\0" \ > + "fdt_addr_r=0x90000000\0" \ > + "load_addr=0xa0000000\0" \ > + "kernel_size=0x2800000\0" \ > + "kernel_size_sd=0x14000\0" \ > + MC_INIT_CMD \ > + BOOTENV \ What do you do with BOOTENV? This causes compiling error. Please verify. I tested this patch on top of you v6 SD patches. York