Re: [U-Boot] [PATCH v5 6/7] armv8: fsl-layerscape: Add support for efi_loader RTS reset
On 10/15/2016 03:03 AM, Alexander Graf wrote: > When implementing efi loader support, we can expose runtime services > for payloads. One such service is CPU reset. > > This patch implements RTS CPU reset support for layerscape systems. > > Signed-off-by: Alexander Graf> > --- > > v4 -> v5: > > - Use __efi_runtime tags > --- > arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 33 > +++-- > 1 file changed, 31 insertions(+), 2 deletions(-) Reviewed-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 1/2] Txxx/RCW: Split unified RCW to RCWs for sd, spi and nand.
On 09/07/2016 10:07 PM, Zhao Qiang wrote: > T series boards use unified RCW for sd, spi and nand boot. > Now split txxx_rcw.cfg to txxx_sd_rcw.cfg, txxx_spi_rcw.cfg > and txxx_nand_rcw.cfg for SPI/NAND/SD boot. > And modify RCW[PBI_SRC] for them: > PBI_SRC=5for SPI 24-bit addressing > PBI_SRC=6for SD boot > PBI_SRC=14 for IFC NAND boot > > Signed-off-by: Zhao Qiang> --- > Changes for v2: > - split to two patches > Changes for v3: > - modify commit msg, explain why modify the PBI_SRC. > Changes for v4: > - modify commit msg > Changes for v5: > - modify commit msg > Applied to u-boot-mpc85xx master, awaiting upstream. Thanks. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mx6: synchronize SPL to u-boot offset
On 10/15/2016 09:17 PM, Max Krummenacher wrote: > Hi Marak > >>> --- a/include/configs/imx6_spl.h >>> +++ b/include/configs/imx6_spl.h >>> @@ -23,6 +23,8 @@ >>> *which consists of a 4K header in front of us that contains >>> the IVT, DCD >>> *and some padding thus 'our' max size is really 0x00908000 - >>> 0x00918000 >>> *or 64KB >>> + * - Padding between start of SPL(with IVT...) and U-Boot is >>> 68KB, SPL starts >>> + *at 1KB, U-Boot at 69kB into the storage media. >>> */ >>> #define CONFIG_SYS_THUMB_BUILD >>> #define CONFIG_SPL_LDSCRIPT"arch/arm/cpu/armv7/omap >>> -common/u-boot-spl.lds" >>> @@ -38,6 +40,7 @@ >>> /* MMC support */ >>> #if defined(CONFIG_SPL_MMC_SUPPORT) >>> #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR138 /* >>> offset 69KB */ >>> +#define CONFIG_SPL_PAD_TO 0x11000 /* offset >>> 68KB */ >> >> Does this mess up boards which can boot from both SD and other boot >> media (NAND, SPI NOR, PNOR...) ? > > Good point. > CONFIG_SPL_PAD_TO is used to create the combined SPL/U-Boot binary. > While I have not found any use of this by any config which includes > imx6_spl.h it might hinder future boards. > So it's probably best to define CONFIG_SPL_PAD_TO in the individual > board configs and skip this patch. So how did you come up with this patch ? What was the thought process? -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] spl: mmc: fix switch statement
On 10/15/2016 09:18 PM, Max Krummenacher wrote: > Hi Marek > > Am Samstag, den 15.10.2016, 19:29 +0200 schrieb Marek Vasut: >> On 10/15/2016 07:10 PM, Max Krummenacher wrote: >>> If CONFIG_SPL_LIBCOMMON_SUPPORT is not defined there is a lone case >>> statement >>> at the end of the switch leading to a compile error. >>> Remove the offending case statement. >>> common/spl/spl_mmc.c:339:7: error: label at end of compound statement >>> >>> Signed-off-by: Max Krummenacher>>> --- >>> >>> common/spl/spl_mmc.c | 1 - >>> 1 file changed, 1 deletion(-) >>> >>> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c >>> index c674e61..367b4e4 100644 >>> --- a/common/spl/spl_mmc.c >>> +++ b/common/spl/spl_mmc.c >>> @@ -342,7 +342,6 @@ static int spl_mmc_load_image(struct >>> spl_image_info *spl_image, >>> return err; >>> >>> break; >>> - case MMCSD_MODE_UNDEFINED: >> >> This patch is wrong -- in case CONFIG_SPL_LIBCOMMON_SUPPORT is >> enabled >> and mode is MMCSD_MODE_UNDEFINED, the message in the puts() below >> would >> be printed. After applying this change, the message won't be printed > > > I disagree. > > With CONFIG_SPL_LIBCOMMON_SUPPORT we had something like this: > switch(bar) { > ... > case foo: > default: > put("bla\n"); > } > > as 'case foo:' falls through into 'default:' removing the specific case > does not change anything. Oh, that's a good point, I missed that and that's in fact pretty elegant fix. Thanks. Acked-by: Marek Vasut [...] -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] spl: mmc: fix switch statement
Hi Marek Am Samstag, den 15.10.2016, 19:29 +0200 schrieb Marek Vasut: > On 10/15/2016 07:10 PM, Max Krummenacher wrote: > > If CONFIG_SPL_LIBCOMMON_SUPPORT is not defined there is a lone case > > statement > > at the end of the switch leading to a compile error. > > Remove the offending case statement. > > > > > common/spl/spl_mmc.c:339:7: error: label at end of compound > > > statement > > > > Signed-off-by: Max Krummenacher> > --- > > > > common/spl/spl_mmc.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > > index c674e61..367b4e4 100644 > > --- a/common/spl/spl_mmc.c > > +++ b/common/spl/spl_mmc.c > > @@ -342,7 +342,6 @@ static int spl_mmc_load_image(struct > > spl_image_info *spl_image, > > return err; > > > > break; > > - case MMCSD_MODE_UNDEFINED: > > This patch is wrong -- in case CONFIG_SPL_LIBCOMMON_SUPPORT is > enabled > and mode is MMCSD_MODE_UNDEFINED, the message in the puts() below > would > be printed. After applying this change, the message won't be printed I disagree. With CONFIG_SPL_LIBCOMMON_SUPPORT we had something like this: switch(bar) { ... case foo: default: put("bla\n"); } as 'case foo:' falls through into 'default:' removing the specific case does not change anything. Regards Max > The fix is probably something like: > > case foo: > default: > #ifdef CONFIG_BAR > puts(); > #endif > break; > > > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT > > default: > > puts("spl: mmc: wrong boot mode\n"); > > > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mx6: synchronize SPL to u-boot offset
Hi Marak > > --- a/include/configs/imx6_spl.h > > +++ b/include/configs/imx6_spl.h > > @@ -23,6 +23,8 @@ > > *which consists of a 4K header in front of us that contains > > the IVT, DCD > > *and some padding thus 'our' max size is really 0x00908000 - > > 0x00918000 > > *or 64KB > > + * - Padding between start of SPL(with IVT...) and U-Boot is > > 68KB, SPL starts > > + *at 1KB, U-Boot at 69kB into the storage media. > > */ > > #define CONFIG_SYS_THUMB_BUILD > > #define CONFIG_SPL_LDSCRIPT"arch/arm/cpu/armv7/omap > > -common/u-boot-spl.lds" > > @@ -38,6 +40,7 @@ > > /* MMC support */ > > #if defined(CONFIG_SPL_MMC_SUPPORT) > > #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR138 /* > > offset 69KB */ > > +#define CONFIG_SPL_PAD_TO 0x11000 /* offset > > 68KB */ > > Does this mess up boards which can boot from both SD and other boot > media (NAND, SPI NOR, PNOR...) ? Good point. CONFIG_SPL_PAD_TO is used to create the combined SPL/U-Boot binary. While I have not found any use of this by any config which includes imx6_spl.h it might hinder future boards. So it's probably best to define CONFIG_SPL_PAD_TO in the individual board configs and skip this patch. Max ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 1/7] ls2080: Exit dpaa only right before exiting U-Boot
On 10/15/2016 03:03 AM, Alexander Graf wrote: > On ls2080 we have a separate network fabric component which we need to > shut down before we enter Linux (or any other OS). Along with that also > comes configuration of the fabric using a description file. > > Today we always stop and configure the fabric in the boot script and > (again) exit it on device tree generation. This works ok for the normal > booti case, but with bootefi the payload we're running may still want to > access the network. > > So let's add a new fsl_mc command that defers configuration and stopping > the hardware to when we actually exit U-Boot, so that we can still use > the fabric from an EFI payload. > > For existing boot scripts, nothing should change with this patch. > > Signed-off-by: Alexander Graf> > --- > > v3 -> v4: > > - Move code into generic quiesce weak function > - Exit device for real when going to Linux > - Only apply DPL if we have something to apply > --- > arch/arm/include/asm/u-boot-arm.h | 1 + > arch/arm/lib/bootm.c| 7 +++ > board/freescale/ls2080a/ls2080a.c | 6 +- > board/freescale/ls2080aqds/ls2080aqds.c | 11 +-- > board/freescale/ls2080ardb/ls2080ardb.c | 11 +-- > drivers/net/fsl-mc/mc.c | 24 ++-- > lib/efi_loader/efi_boottime.c | 2 ++ > 7 files changed, 47 insertions(+), 15 deletions(-) Reviewed-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] power: twl6030: fix code refactoring
Hi, Le samedi 15 octobre 2016 à 20:41 +0300, Nicolae Rosia a écrit : > Hi, > > On Fri, Oct 14, 2016 at 4:28 PM, Paul Kocialkowskiwrote: > > > > Le jeudi 13 octobre 2016 à 13:47 +0300, Nicolae Rosia a écrit : > > > > > > From: Nicolae Rosia > > > > > > Commit a85362fb3e1fc7833723accddbbae431091d06b8 refactored the code > > > but the register read ended up in the wrong if branch. > > > Currently, the else branch checks a variable which is always 0. > > > > Good catch! Sorry for including that regression in the first place, I should > > have checked the patch more thoroughly. > No worries! > > > > > See comment below. > > The indentation before is inconsistent with what is done in the rest > > of > > the file. I think you should either just move the line as it was or only use > > one > > extra tab indent for the new line. Since this file breaks the 80 chars limit > > in > > a few places, I would tend to prefer the former. > > > checkpatch.pl was complaining, that's why I formatted it. Then I think you should fix the rest of the file accordingly. It doesn't make sense to introduce a variation in the coding style, as it creates inconsistency. IMO this is worse than having only subsequent changes conform to the global U-Boot coding style. > @Tom Rini, can you apply it either way? > > Best regards, > Nicolae -- Paul Kocialkowski, developer of free digital technology at the lower levels Website: https://www.paulk.fr/ Coding blog: https://code.paulk.fr/ Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/ signature.asc Description: This is a digitally signed message part ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] power: twl6030: fix code refactoring
On Sat, Oct 15, 2016 at 08:41:35PM +0300, Nicolae Rosia wrote: > Hi, > > On Fri, Oct 14, 2016 at 4:28 PM, Paul Kocialkowskiwrote: > > Le jeudi 13 octobre 2016 à 13:47 +0300, Nicolae Rosia a écrit : > >> From: Nicolae Rosia > >> > >> Commit a85362fb3e1fc7833723accddbbae431091d06b8 refactored the code > >> but the register read ended up in the wrong if branch. > >> Currently, the else branch checks a variable which is always 0. > > > > Good catch! Sorry for including that regression in the first place, I should > > have checked the patch more thoroughly. > No worries! > > > See comment below. > > The indentation before is inconsistent with what is done in the rest > > of > > the file. I think you should either just move the line as it was or only > > use one > > extra tab indent for the new line. Since this file breaks the 80 chars > > limit in > > a few places, I would tend to prefer the former. > > > checkpatch.pl was complaining, that's why I formatted it. > @Tom Rini, can you apply it either way? I'll take this and do you want to do a follow up to make the file checkpatch clean? Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] power: twl6030: fix code refactoring
Hi, On Fri, Oct 14, 2016 at 4:28 PM, Paul Kocialkowskiwrote: > Le jeudi 13 octobre 2016 à 13:47 +0300, Nicolae Rosia a écrit : >> From: Nicolae Rosia >> >> Commit a85362fb3e1fc7833723accddbbae431091d06b8 refactored the code >> but the register read ended up in the wrong if branch. >> Currently, the else branch checks a variable which is always 0. > > Good catch! Sorry for including that regression in the first place, I should > have checked the patch more thoroughly. No worries! > See comment below. > The indentation before is inconsistent with what is done in the rest of > the file. I think you should either just move the line as it was or only use > one > extra tab indent for the new line. Since this file breaks the 80 chars limit > in > a few places, I would tend to prefer the former. > checkpatch.pl was complaining, that's why I formatted it. @Tom Rini, can you apply it either way? Best regards, Nicolae ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 2/2] pbl: use "wait" command instead of "flush" command
On 09/07/2016 10:07 PM, Zhao Qiang wrote: > PBL flush command is restricted to CCSR memory space. > So use WAIT PBI command to provide enough time for data to get flush in > target memory > > Signed-off-by: Zhao Qiang> --- > Changes for v2: > - split to two patches > Changes for v3: > - modify commit msg > Changes for v4: > - modify commit msg > Changes for v5: > - na > Applied to u-boot-mpc85xx master, awaiting upstream. Thanks. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC] 0/4] Add Pl330 DMA support
On 10/15/2016 12:13 AM, Dinh Nguyen wrote: > > > On 10/14/2016 10:09 AM, Marek Vasut wrote: >> On 10/14/2016 03:08 PM, Dinh Nguyen wrote: >>> >>> >>> On 10/14/2016 02:23 AM, Marek Vasut wrote: On 10/10/2016 05:52 PM, Dinh Nguyen wrote: > Hi, Hi, > This patchset adds the PL330 DMA driver to U-Boot. The SoCFPGA platform > makes > use of the PL330 to transfer zereos to the SDRAM which enables the ECC > bit. Is there some considerable performanCONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCENce benefit over memset() in this case ? >>> >>> Yes, with the DMA, it takes ~1.5 secs, with memset, it's ~15 secs. >> >> Understood, thanks. I hope the scrubbing can be disabled in non-ECC case ? >> > > Yes, the scrubbing is only done if CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN > == 1. Understood, thanks for confirming. I will check 1/4 and 4/4 shortly, I just got back from ELCE and I'm dead tired. -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mx6: synchronize SPL to u-boot offset
On 10/15/2016 07:10 PM, Max Krummenacher wrote: > Synchronize CONFIG_SPL_PAD_TO (used at build time for u-boot-with-spl.imx) > with > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR (used by SPL to read u-boot image). > > Signed-off-by: Max Krummenacher> --- > > include/configs/imx6_spl.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h > index 76d1ca0..0b426bb 100644 > --- a/include/configs/imx6_spl.h > +++ b/include/configs/imx6_spl.h > @@ -23,6 +23,8 @@ > *which consists of a 4K header in front of us that contains the IVT, DCD > *and some padding thus 'our' max size is really 0x00908000 - 0x00918000 > *or 64KB > + * - Padding between start of SPL(with IVT...) and U-Boot is 68KB, SPL > starts > + *at 1KB, U-Boot at 69kB into the storage media. > */ > #define CONFIG_SYS_THUMB_BUILD > #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/omap-common/u-boot-spl.lds" > @@ -38,6 +40,7 @@ > /* MMC support */ > #if defined(CONFIG_SPL_MMC_SUPPORT) > #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 138 /* offset 69KB */ > +#define CONFIG_SPL_PAD_TO0x11000 /* offset 68KB */ Does this mess up boards which can boot from both SD and other boot media (NAND, SPI NOR, PNOR...) ? > #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800 /* 400 KB */ > #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > #define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS/2*1024) > -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm
On 10/15/2016 04:05 PM, Tom Rini wrote: > On Sat, Oct 15, 2016 at 06:32:46PM +0530, Jagan Teki wrote: > >> CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved >> to non-dm from global area. >> >> Cc: Simon Glass>> Cc: Marek Vasut >> Cc: Masahiro Yamada >> Signed-off-by: Jagan Teki >> --- >> drivers/usb/host/ehci-hcd.c | 8 >> drivers/usb/host/xhci.c | 8 >> 2 files changed, 8 insertions(+), 8 deletions(-) > > It would be better to just move this to Kconfig, thanks. > Yes, agreed. -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] spl: mmc: fix switch statement
On 10/15/2016 07:10 PM, Max Krummenacher wrote: > If CONFIG_SPL_LIBCOMMON_SUPPORT is not defined there is a lone case statement > at the end of the switch leading to a compile error. > Remove the offending case statement. > > | common/spl/spl_mmc.c:339:7: error: label at end of compound statement > > Signed-off-by: Max Krummenacher> --- > > common/spl/spl_mmc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > index c674e61..367b4e4 100644 > --- a/common/spl/spl_mmc.c > +++ b/common/spl/spl_mmc.c > @@ -342,7 +342,6 @@ static int spl_mmc_load_image(struct spl_image_info > *spl_image, > return err; > > break; > - case MMCSD_MODE_UNDEFINED: This patch is wrong -- in case CONFIG_SPL_LIBCOMMON_SUPPORT is enabled and mode is MMCSD_MODE_UNDEFINED, the message in the puts() below would be printed. After applying this change, the message won't be printed . The fix is probably something like: case foo: default: #ifdef CONFIG_BAR puts(); #endif break; > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT > default: > puts("spl: mmc: wrong boot mode\n"); > -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] mx6: synchronize SPL to u-boot offset
Synchronize CONFIG_SPL_PAD_TO (used at build time for u-boot-with-spl.imx) with CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR (used by SPL to read u-boot image). Signed-off-by: Max Krummenacher--- include/configs/imx6_spl.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 76d1ca0..0b426bb 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -23,6 +23,8 @@ *which consists of a 4K header in front of us that contains the IVT, DCD *and some padding thus 'our' max size is really 0x00908000 - 0x00918000 *or 64KB + * - Padding between start of SPL(with IVT...) and U-Boot is 68KB, SPL starts + *at 1KB, U-Boot at 69kB into the storage media. */ #define CONFIG_SYS_THUMB_BUILD #define CONFIG_SPL_LDSCRIPT"arch/arm/cpu/armv7/omap-common/u-boot-spl.lds" @@ -38,6 +40,7 @@ /* MMC support */ #if defined(CONFIG_SPL_MMC_SUPPORT) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR138 /* offset 69KB */ +#define CONFIG_SPL_PAD_TO 0x11000 /* offset 68KB */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800 /* 400 KB */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS/2*1024) -- 2.6.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/3] imx: make ipu's di configurable
The ipu has two display interfaces. Make the used one a parameter in struct display_info_t instead of using unconditionally DI0. DI0 is the default setting. Signed-off-by: Max Krummenacher--- arch/arm/imx-common/video.c | 2 +- arch/arm/include/asm/imx-common/video.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index fdc987f..549bf9d 100644 --- a/arch/arm/imx-common/video.c +++ b/arch/arm/imx-common/video.c @@ -34,7 +34,7 @@ int board_video_skip(void) } if (i < display_count) { - ret = ipuv3_fb_init([i].mode, 0, + ret = ipuv3_fb_init([i].mode, displays[i].di ? 1 : 0, displays[i].pixfmt); if (!ret) { if (displays[i].enable) diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h index cad5f86..941a031 100644 --- a/arch/arm/include/asm/imx-common/video.h +++ b/arch/arm/include/asm/imx-common/video.h @@ -12,6 +12,7 @@ struct display_info_t { int bus; int addr; int pixfmt; + int di; int (*detect)(struct display_info_t const *dev); void(*enable)(struct display_info_t const *dev); struct fb_videomode mode; -- 2.6.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] spl: mmc: fix switch statement
If CONFIG_SPL_LIBCOMMON_SUPPORT is not defined there is a lone case statement at the end of the switch leading to a compile error. Remove the offending case statement. | common/spl/spl_mmc.c:339:7: error: label at end of compound statement Signed-off-by: Max Krummenacher--- common/spl/spl_mmc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c674e61..367b4e4 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -342,7 +342,6 @@ static int spl_mmc_load_image(struct spl_image_info *spl_image, return err; break; - case MMCSD_MODE_UNDEFINED: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT default: puts("spl: mmc: wrong boot mode\n"); -- 2.6.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 2/7] efi_loader: AArch64: Run EFI payloads in EL2 if U-Boot runs in EL3
On 10/15/2016 03:03 AM, Alexander Graf wrote: > Some boards decided not to run ATF or other secure firmware in EL3, so > they instead run U-Boot there. The uEFI spec doesn't know what EL3 is > though - it only knows about EL2 and EL1. So if we see that we're running > in EL3, let's get into EL2 to make payloads happy. > > Signed-off-by: Alexander Graf> > --- > > v4 -> v5: > > - Remove manual ttbr / tcr copy > - Regenerate page tables in EL2, getting us non-secured page tables > --- > cmd/bootefi.c | 11 +++ > 1 file changed, 11 insertions(+) > > diff --git a/cmd/bootefi.c b/cmd/bootefi.c > index 8714666..32148d7 100644 > --- a/cmd/bootefi.c > +++ b/cmd/bootefi.c > @@ -224,6 +224,17 @@ static unsigned long do_bootefi_exec(void *efi, void > *fdt) > return status == EFI_SUCCESS ? 0 : -EINVAL; > } > > +#ifdef CONFIG_ARM64 > + /* On AArch64 we need to make sure we call our payload in < EL3 */ > + if (current_el() == 3) { > + smp_kick_all_cpus(); > + dcache_disable(); /* flush cache before switch to EL2 */ > + armv8_switch_to_el2(); > + /* Enable caches again */ > + dcache_enable(); > + } > +#endif > + > return entry(_image_info, ); > } > > Reviewed-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm
On Sun, Oct 16, 2016 at 02:02:13AM +0900, Masahiro Yamada wrote: > 2016-10-15 23:05 GMT+09:00 Tom Rini: > > On Sat, Oct 15, 2016 at 06:32:46PM +0530, Jagan Teki wrote: > > > >> CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved > >> to non-dm from global area. > >> > >> Cc: Simon Glass > >> Cc: Marek Vasut > >> Cc: Masahiro Yamada > >> Signed-off-by: Jagan Teki > >> --- > >> drivers/usb/host/ehci-hcd.c | 8 > >> drivers/usb/host/xhci.c | 8 > >> 2 files changed, 8 insertions(+), 8 deletions(-) > > > > It would be better to just move this to Kconfig, thanks. > > This option will be removed sooner or later. > > Do we need to move deprecated options to Kconfig? If someone is touching it I'd rather see it moved. So we could just drop this patch. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arch: powerpc: Remove unused dts frequency fixup for lbc_clk
On 09/30/2016 01:57 AM, Prabhakar Kushwaha wrote: > lbc_clk is used to fixup dts as "bus frequency". > It is not being used by Linux IFC and eLBC driver. > > So remove unused "bus frqeuency" fix-up of devicre tree. > > Signed-off-by: Prabhakar Kushwaha> --- > arch/powerpc/cpu/mpc85xx/fdt.c | 4 > arch/powerpc/cpu/mpc86xx/fdt.c | 7 --- > 2 files changed, 11 deletions(-) > Applied to u-boot-mpc85xx master, awaiting upstream. Thanks. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 3/7] ls2080ardb: Reserve DP-DDR RAM
On 10/15/2016 03:03 AM, Alexander Graf wrote: > The DP-DDR shouldn't be exposed as conventional memory to an OS, so let's > rather claim it's a reserved region in the EFI memory map > > Signed-off-by: Alexander Graf> --- > board/freescale/ls2080ardb/ls2080ardb.c | 9 + > 1 file changed, 9 insertions(+) > > diff --git a/board/freescale/ls2080ardb/ls2080ardb.c > b/board/freescale/ls2080ardb/ls2080ardb.c > index fab44b9..55199ca 100644 > --- a/board/freescale/ls2080ardb/ls2080ardb.c > +++ b/board/freescale/ls2080ardb/ls2080ardb.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -201,6 +202,14 @@ int misc_init_r(void) > if (adjust_vdd(0)) > printf("Warning: Adjusting core voltage failed.\n"); > > +#ifdef CONFIG_EFI_LOADER > + if (soc_has_dp_ddr() && gd->bd->bi_dram[2].size) { > + efi_add_memory_map(gd->bd->bi_dram[2].start, > +gd->bd->bi_dram[2].size >> EFI_PAGE_SHIFT, > +EFI_RESERVED_MEMORY_TYPE, false); > + } > +#endif > + > return 0; > } > > Reviewed-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm
2016-10-15 23:05 GMT+09:00 Tom Rini: > On Sat, Oct 15, 2016 at 06:32:46PM +0530, Jagan Teki wrote: > >> CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved >> to non-dm from global area. >> >> Cc: Simon Glass >> Cc: Marek Vasut >> Cc: Masahiro Yamada >> Signed-off-by: Jagan Teki >> --- >> drivers/usb/host/ehci-hcd.c | 8 >> drivers/usb/host/xhci.c | 8 >> 2 files changed, 8 insertions(+), 8 deletions(-) > > It would be better to just move this to Kconfig, thanks. > This option will be removed sooner or later. Do we need to move deprecated options to Kconfig? -- Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-mpc85xx master
Tom, The following changes since commit 44afdc4a12b9f6f48338e7975e4f08cfe90dba74: Merge branch 'master' of git://git.denx.de/u-boot-net (2016-10-13 13:38:49 -0400) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git for you to fetch changes up to a9320c495ef938cb96f0862dca79e899e4fa: arch: powerpc: Remove unused dts frequency fixup for lbc_clk (2016-10-14 10:23:11 -0700) Prabhakar Kushwaha (1): arch: powerpc: Remove unused dts frequency fixup for lbc_clk Zhao Qiang (2): Txxx/RCW: Split unified RCW to RCWs for sd, spi and nand. pbl: use "wait" command instead of "flush" command arch/powerpc/cpu/mpc85xx/fdt.c | 4 -- arch/powerpc/cpu/mpc86xx/fdt.c | 7 -- .../t102xqds/{t1024_rcw.cfg => t1024_nand_rcw.cfg} | 0 board/freescale/t102xqds/t1024_sd_rcw.cfg | 10 +++ board/freescale/t102xqds/t1024_spi_rcw.cfg | 10 +++ .../t102xrdb/{t1023_rcw.cfg => t1023_nand_rcw.cfg} | 0 board/freescale/t102xrdb/t1023_sd_rcw.cfg | 8 +++ board/freescale/t102xrdb/t1023_spi_rcw.cfg | 8 +++ .../t102xrdb/{t1024_rcw.cfg => t1024_nand_rcw.cfg} | 0 board/freescale/t102xrdb/t1024_sd_rcw.cfg | 8 +++ board/freescale/t102xrdb/t1024_spi_rcw.cfg | 8 +++ .../t104xrdb/{t1040_rcw.cfg => t1040_nand_rcw.cfg} | 0 board/freescale/t104xrdb/t1040_sd_rcw.cfg | 7 ++ board/freescale/t104xrdb/t1040_spi_rcw.cfg | 7 ++ .../{t1040d4_rcw.cfg => t1040d4_nand_rcw.cfg} | 0 board/freescale/t104xrdb/t1040d4_sd_rcw.cfg| 7 ++ board/freescale/t104xrdb/t1040d4_spi_rcw.cfg | 7 ++ .../t104xrdb/{t1042_rcw.cfg => t1042_nand_rcw.cfg} | 0 .../{t1042_pi_rcw.cfg => t1042_pi_nand_rcw.cfg}| 0 board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg | 7 ++ board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg | 7 ++ board/freescale/t104xrdb/t1042_sd_rcw.cfg | 7 ++ board/freescale/t104xrdb/t1042_spi_rcw.cfg | 7 ++ .../{t1042d4_rcw.cfg => t1042d4_nand_rcw.cfg} | 0 board/freescale/t104xrdb/t1042d4_sd_rcw.cfg| 7 ++ board/freescale/t104xrdb/t1042d4_spi_rcw.cfg | 7 ++ .../t208xqds/{t2080_rcw.cfg => t2080_nand_rcw.cfg} | 0 board/freescale/t208xqds/t2080_sd_rcw.cfg | 16 + board/freescale/t208xqds/t2080_spi_rcw.cfg | 16 + .../t208xqds/{t2081_rcw.cfg => t2081_nand_rcw.cfg} | 0 board/freescale/t208xqds/t2081_sd_rcw.cfg | 8 +++ board/freescale/t208xqds/t2081_spi_rcw.cfg | 8 +++ board/freescale/t208xqds/t208x_pbi.cfg | 3 +- .../t208xrdb/{t2080_rcw.cfg => t2080_nand_rcw.cfg} | 0 board/freescale/t208xrdb/t2080_pbi.cfg | 3 +- board/freescale/t208xrdb/t2080_sd_rcw.cfg | 19 ++ board/freescale/t208xrdb/t2080_spi_rcw.cfg | 19 ++ .../t4qds/{t4_rcw.cfg => t4_nand_rcw.cfg} | 2 +- board/freescale/t4qds/t4_pbi.cfg | 3 +- board/freescale/t4qds/t4_sd_rcw.cfg| 7 ++ board/freescale/t4rdb/t4_pbi.cfg | 3 +- .../freescale/t4rdb/{t4_rcw.cfg => t4_sd_rcw.cfg} | 2 +- include/configs/T102xQDS.h | 4 +- include/configs/T102xRDB.h | 20 -- include/configs/T104xRDB.h | 78 +- include/configs/T208xQDS.h | 20 -- include/configs/T208xRDB.h | 4 +- include/configs/T4240QDS.h | 3 +- include/configs/T4240RDB.h | 2 +- tools/pblimage.c | 2 +- 50 files changed, 321 insertions(+), 54 deletions(-) rename board/freescale/t102xqds/{t1024_rcw.cfg => t1024_nand_rcw.cfg} (100%) create mode 100644 board/freescale/t102xqds/t1024_sd_rcw.cfg create mode 100644 board/freescale/t102xqds/t1024_spi_rcw.cfg rename board/freescale/t102xrdb/{t1023_rcw.cfg => t1023_nand_rcw.cfg} (100%) create mode 100644 board/freescale/t102xrdb/t1023_sd_rcw.cfg create mode 100644 board/freescale/t102xrdb/t1023_spi_rcw.cfg rename board/freescale/t102xrdb/{t1024_rcw.cfg => t1024_nand_rcw.cfg} (100%) create mode 100644 board/freescale/t102xrdb/t1024_sd_rcw.cfg create mode 100644 board/freescale/t102xrdb/t1024_spi_rcw.cfg rename board/freescale/t104xrdb/{t1040_rcw.cfg => t1040_nand_rcw.cfg} (100%) create mode 100644 board/freescale/t104xrdb/t1040_sd_rcw.cfg create mode 100644 board/freescale/t104xrdb/t1040_spi_rcw.cfg rename board/freescale/t104xrdb/{t1040d4_rcw.cfg => t1040d4_nand_rcw.cfg} (100%) create mode 100644 board/freescale/t104xrdb/t1040d4_sd_rcw.cfg create mode 100644 board/freescale/t104xrdb/t1040d4_spi_rcw.cfg rename board/freescale/t104xrdb/{t1042_rcw.cfg => t1042_nand_rcw.cfg} (100%) rename
Re: [U-Boot] [PATCH v5 7/7] efi_loader: Declare secure memory as reserved
On 10/15/2016 03:03 AM, Alexander Graf wrote: > Some systems may implemente TrustZone (EL3) in U-Boot. Those systems > reserve some memory that U-Boot is aware of as secure. > > For those systems, mask out that secure memory in the EFI memory map, > as it's not usable from EL2 or EL1. > > Signed-off-by: Alexander Graf> > --- > > v4 -> v5: > > - Use gd->arch.secure_ram > --- > lib/efi_loader/efi_memory.c | 15 +++ > 1 file changed, 15 insertions(+) > > diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c > index 95aa590..4966e48 100644 > --- a/lib/efi_loader/efi_memory.c > +++ b/lib/efi_loader/efi_memory.c > @@ -474,5 +474,20 @@ int efi_memory_init(void) > efi_bounce_buffer = (void*)(uintptr_t)efi_bounce_buffer_addr; > #endif > > +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE > + /* Declare secure ram as reserved */ > +if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) { > + uint64_t secure_start = gd->arch.secure_ram; > + uint64_t secure_pages = CONFIG_SYS_MEM_RESERVE_SECURE; > + > + secure_start &= MEM_RESERVE_SECURE_ADDR_MASK; > + secure_start &= ~EFI_PAGE_MASK; > + secure_pages = (secure_pages + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; > + > + efi_add_memory_map(secure_start, secure_pages, > +EFI_RESERVED_MEMORY_TYPE, false); > +} > +#endif > + > return 0; > } > Alex, Do you see any issue without this patch? The secure memory is not visible to OS. gd->ram_size is reduced to hide the secure memory. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 5/7] armv8: ls2080a: Declare spin tables as reserved for efi loader
On 10/15/2016 03:03 AM, Alexander Graf wrote: > The efi loader code has its own memory map, so it needs to be aware where > the spin tables are located, to ensure that no code writes into those > regions. > > Signed-off-by: Alexander Graf> --- > arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > index 1a8321b..facfcca 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c > @@ -5,6 +5,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -105,6 +106,11 @@ remove_psci_node: > > fdt_add_mem_rsv(blob, (uintptr_t)_boot_code, > *boot_code_size); > +#ifdef CONFIG_EFI_LOADER > + efi_add_memory_map((uintptr_t)_boot_code, > +ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> > EFI_PAGE_SHIFT, > +EFI_RESERVED_MEMORY_TYPE, false); > +#endif > } > #endif > > Alex, Does it make more sense to use __spin_table instead of secondary_boot_code (even they happen to have the same value here)? York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 4/7] ls2080ardb: Convert to distro boot
On 10/15/2016 03:03 AM, Alexander Graf wrote: > Most new systems in U-Boot these days make use of the generic "distro" > framework which allows a user to have U-Boot scan for a bootable OS > on all available media types. > > This patch extends the LS2080ARDB board to use that framework if the > hard coded NOR flash location does not contain a bootable image. > > Signed-off-by: Alexander Graf> > --- > > v1 -> v2: > > - Boot NOR flash before distro boot > > v2 -> v3: > > - Actually run distro boot (s/&&/||/ after bootm) > > v3 -> v4: > > - Add CONFIG_CMD_FS_GENERIC to defconfig > > v4 -> v5: > > - Add qspi board > - Don't overwrite ethact Alex, Don't we have an issue to run distro boot right after this patch? I think this patch should be the last in this set. Don't you agree? For this patch itself, Reviewed-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] CONFIG_USE_ARCH_MEMSET/MEMCPY and SPL not working
Hi I'm moving an i.MX6 based system to use SPL. With CONFIG_USE_ARCH_MEMSET/MEMCPY enabled the SPL build fails with undefined reference to `memset' undefined reference to `memcpy' The following RFC Patch should have made it in mainline by way of u -boot-arm, however it didn't. http://lists.denx.de/pipermail/u-boot/2015-February/203836.html http://lists.denx.de/pipermail/u-boot/2015-June/215848.html Is there a reason that the patch did not make it in mainline? Regards Max P.S.: The issue has been brought up earlier also, AFAIK without any response: http://lists.denx.de/pipermail/u-boot/2013-July/159045.html ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] OMAP3: omap3_logic: Add scripts to boot over network.
On Sat, Oct 15, 2016 at 08:16:27AM -0500, Adam Ford wrote: > Not all networks have a DHCP server configured properly, so these > scripts make it easier to boot in that scenario. > > Signed-off-by: Adam Ford> > diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h > index 95ff5c3..0827ebe 100644 Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm
On Sat, Oct 15, 2016 at 06:32:46PM +0530, Jagan Teki wrote: > CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved > to non-dm from global area. > > Cc: Simon Glass> Cc: Marek Vasut > Cc: Masahiro Yamada > Signed-off-by: Jagan Teki > --- > drivers/usb/host/ehci-hcd.c | 8 > drivers/usb/host/xhci.c | 8 > 2 files changed, 8 insertions(+), 8 deletions(-) It would be better to just move this to Kconfig, thanks. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] rk3288: kconfig: remove duplicate definition of SPL_MMC_SUPPORT
On 15 October 2016 at 07:21, Simon Glasswrote: > On 8 October 2016 at 01:23, Kever Yang wrote: >> SPL_MMC_SUPPORT defined in rockchip top level Kconfig instead of >> inside rk3288 and default to disable if ROCKCHIP_SPL_BACK_TO_BROM >> defined. >> >> >> Signed-off-by: Kever Yang >> --- >> >> arch/arm/mach-rockchip/rk3288/Kconfig | 3 --- >> 1 file changed, 3 deletions(-) > > Reviewed-by: Simon Glass Applied to u-boot-rockchip ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/3] rk3288: sdram: auto-detect the capacity
On 15 October 2016 at 07:24, Simon Glasswrote: > On 10 October 2016 at 11:12, Vagrant Cascadian wrote: >> On 2016-10-07, Kever Yang wrote: >>> Add support for rk3288 dram capacity auto detect, support DDR3 and >>> LPDDR3, DDR2 is not supported. >>> The program will automatically detect: >>> - channel number >>> - rank number >>> - column address number >>> - row address number >>> >>> The dts file do not need to describe those info after apply this patch. >>> >>> Signed-off-by: Kever Yang >>> Tested-by: Simon Glass >>> Tested-by: Vagrant Cascadian >>> --- >>> >>> Changes in v3: >>> - add error report and return value when error happen >>> - add comments for stride and address bits. >>> >>> Changes in v2: >>> - update code for OF_PLATDATA enabled >>> - bug fix for ddrconfig >> >> Tested the updated v3 patch with u-boot 2016.11-rc1, using both firefly >> 2GB and 4GB variants. Both detect appropriate amount of ram and >> otherwise work fine. >> >> Tested-by: Vagrant Cascadian >> >> live well, >> vagrant > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] rk3288: fix reg address for GRF_SOC_CON2
On 15 October 2016 at 07:24, Simon Glasswrote: > On 7 October 2016 at 01:59, Kever Yang wrote: >> The GRF base address is missing, fix it. >> >> Signed-off-by: Kever Yang >> --- >> >> arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 3/3] dts: rk3288: remove node in dmc which not need anymore
On 15 October 2016 at 07:24, Simon Glasswrote: > On 7 October 2016 at 03:47, Kever Yang wrote: >> Since we implement the dram capacity auto detect, we don't >> need to set the channel number and sdram-channel in dts. >> >> Signed-off-by: Kever Yang >> Acked-by: Simon Glass >> Tested-by: Simon Glass >> Tested-by: Vagrant Cascadian >> --- >> >> Changes in v3: None >> Changes in v2: None >> >> arch/arm/dts/rk3288-evb.dts | 3 --- >> arch/arm/dts/rk3288-fennec.dts | 3 --- >> arch/arm/dts/rk3288-firefly.dts | 2 -- >> arch/arm/dts/rk3288-miniarm.dts | 3 --- >> arch/arm/dts/rk3288-popmetal.dts | 3 --- >> arch/arm/dts/rk3288-rock2-square.dts | 2 -- >> arch/arm/dts/rk3288-veyron.dtsi | 2 -- >> 7 files changed, 18 deletions(-) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] evb-rk3399: config: set emmc as default boot dev
On 15 October 2016 at 07:24, Simon Glasswrote: > On 7 October 2016 at 02:05, Kever Yang wrote: >> rk3399 has two mmc dev controller: >> mmc 0: SD card; >> mmc 1: EMMC >> >> U-Boot will scan the mmc boot device configured by CONFIG_SYS_MMC_ENV_DEV, >> since evb has emmc on board, let's set the EMMC as default. >> >> Signed-off-by: Kever Yang >> --- >> >> include/configs/evb_rk3399.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/3] rk3288: config change for enable dram capacity auto-detect.
On 15 October 2016 at 07:24, Simon Glasswrote: > On 7 October 2016 at 03:47, Kever Yang wrote: >> Enable ROCKCHIP_SPL_BACK_TO_BROM and disable CONFIG_SPL_MMC_SUPPORT >> to save memory in order to enable add source code for dram capacity >> auto-detect. >> >> Signed-off-by: Kever Yang >> --- >> >> Changes in v3: >> - move the config into defconfig file >> >> Changes in v2: None >> >> configs/evb-rk3288_defconfig | 1 + >> configs/fennec-rk3288_defconfig | 1 + >> configs/miniarm-rk3288_defconfig | 1 + >> configs/popmetal-rk3288_defconfig | 1 + >> 4 files changed, 4 insertions(+) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/2] rockchip: doc: add GPT partition layout
On 15 October 2016 at 07:25, Simon Glasswrote: > On 7 October 2016 at 23:47, Jacob Chen wrote: >> A simple introduction. >> >> Signed-off-by: Jacob Chen >> Acked-by: Simon Glass >> --- >> >> Changes in v3: None >> Changes in v2: None >> >> doc/README.rockchip | 11 +-- >> 1 file changed, 9 insertions(+), 2 deletions(-) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/2] rockchip: use rockchip linux partitions layout
On 15 October 2016 at 07:25, Simon Glasswrote: > On 8 October 2016 at 01:38, Kever Yang wrote: >> Hi Jacob, >> >> >> On 10/08/2016 01:47 PM, Jacob Chen wrote: >>> >>> Unify the partitions of each chip then it will be more easy for us to >>> write scripts, tools or guides for rockchip chips. >>> >>> Those extra partitions mostly are used to be compatible with our >>> internal loaders (such as miniloader which was same as spl, or >>> android loader then we can support dual boot) >>> >>> Signed-off-by: Jacob Chen >>> --- >>> >>> Changes in v3: >>> - correct the copyright >>> >>> Changes in v2: >>> - put macro in a rockchip_common.h >>> >>> include/configs/rk3036_common.h | 17 + >>> include/configs/rk3288_common.h | 17 + >>> include/configs/rk3399_common.h | 16 ++-- >>> include/configs/rockchip-common.h | 35 >>> +++ >>> 4 files changed, 39 insertions(+), 46 deletions(-) >>> create mode 100644 include/configs/rockchip-common.h >>> >>> diff --git a/include/configs/rk3036_common.h >>> b/include/configs/rk3036_common.h >>> index 73830e4..29d56ff 100644 >>> --- a/include/configs/rk3036_common.h >>> +++ b/include/configs/rk3036_common.h >>> @@ -7,6 +7,7 @@ >>> #define __CONFIG_RK3036_COMMON_H >>> #include >>> +#include "rockchip-common.h" >>> #define CONFIG_SYS_NO_FLASH >>> #define CONFIG_NR_DRAM_BANKS 1 >>> @@ -79,11 +80,6 @@ >>> #define CONFIG_G_DNL_VENDOR_NUM 0x2207 >>> #define CONFIG_G_DNL_PRODUCT_NUM 0x310a >>> -/* Enable gpt partition table */ >>> -#define CONFIG_CMD_GPT >>> - >>> -#include >>> - >>> #define ENV_MEM_LAYOUT_SETTINGS \ >>> "scriptaddr=0x6000\0" \ >>> "pxefile_addr_r=0x6010\0" \ >>> @@ -91,17 +87,6 @@ >>> "kernel_addr_r=0x6200\0" \ >>> "ramdisk_addr_r=0x6400\0" >>> -#define CONFIG_RANDOM_UUID >>> -#define PARTS_DEFAULT \ >>> - "uuid_disk=${uuid_gpt_disk};" \ >>> - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ >>> - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ >>> - >>> -/* First try to boot from SD (index 0), then eMMC (index 1 */ >>> -#define BOOT_TARGET_DEVICES(func) \ >>> - func(MMC, mmc, 0) \ >>> - func(MMC, mmc, 1) >>> - >>> #include >>> /* Linux fails to load the fdt if it's loaded above 512M on a >>> evb-rk3036 board, >>> diff --git a/include/configs/rk3288_common.h >>> b/include/configs/rk3288_common.h >>> index 9ddfe1d..630f218 100644 >>> --- a/include/configs/rk3288_common.h >>> +++ b/include/configs/rk3288_common.h >>> @@ -8,6 +8,7 @@ >>> #define __CONFIG_RK3288_COMMON_H >>> #include >>> +#include "rockchip-common.h" >>> #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY >>> #define CONFIG_SYS_NO_FLASH >>> @@ -96,11 +97,6 @@ >>> #define CONFIG_G_DNL_VENDOR_NUM 0x2207 >>> #define CONFIG_G_DNL_PRODUCT_NUM 0x320a >>> -/* Enable gpt partition table */ >>> -#define CONFIG_CMD_GPT >>> - >>> -#include >>> - >>> #define ENV_MEM_LAYOUT_SETTINGS \ >>> "scriptaddr=0x\0" \ >>> "pxefile_addr_r=0x0010\0" \ >>> @@ -108,17 +104,6 @@ >>> "kernel_addr_r=0x0200\0" \ >>> "ramdisk_addr_r=0x0400\0" >>> -#define CONFIG_RANDOM_UUID >>> -#define PARTS_DEFAULT \ >>> - "uuid_disk=${uuid_gpt_disk};" \ >>> - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ >>> - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ >>> - >>> -/* First try to boot from SD (index 0), then eMMC (index 1 */ >>> -#define BOOT_TARGET_DEVICES(func) \ >>> - func(MMC, mmc, 0) \ >>> - func(MMC, mmc, 1) >>> - >>> #include >>> /* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 >>> board, so >>> diff --git a/include/configs/rk3399_common.h >>> b/include/configs/rk3399_common.h >>> index b026122..68b9391 100644 >>> --- a/include/configs/rk3399_common.h >>> +++ b/include/configs/rk3399_common.h >>> @@ -7,6 +7,8 @@ >>> #ifndef __CONFIG_RK3399_COMMON_H >>> #define __CONFIG_RK3399_COMMON_H >>> +#include "rockchip-common.h" >>> + >>> #define CONFIG_SYS_NO_FLASH >>> #define CONFIG_NR_DRAM_BANKS 1 >>> #define CONFIG_ENV_SIZE 0x2000 >>> @@ -53,7 +55,6 @@ >>> #define CONFIG_SF_DEFAULT_SPEED 2000 >>> #ifndef CONFIG_SPL_BUILD >>> -#include >>> #define ENV_MEM_LAYOUT_SETTINGS \ >>> "scriptaddr=0x\0" \ >>> @@ -62,19 +63,6 @@ >>> "kernel_addr_r=0x0200\0" \ >>> "ramdisk_addr_r=0x0400\0" >>> -#define CONFIG_CMD_GPT >>> -#define CONFIG_RANDOM_UUID >>> -#define CONFIG_PARTITION_UUIDS >>> -#define PARTS_DEFAULT \ >>> - "uuid_disk=${uuid_gpt_disk};" \ >>> - "name=boot,start=16M,size=32M,bootable;" \ >>> - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ >>> - >>> -/* First
Re: [U-Boot] [PATCH] rk3399: disable the clock multiplier support when SoC init
On 15 October 2016 at 07:24, Simon Glasswrote: > On 7 October 2016 at 01:56, Kever Yang wrote: >> The Clock Multiplier in rk3399 EMMC programmable clock generator >> is broken, we can remove its support from SoC GRF register. >> >> Without this patch, rk3399 emmc driver is not work after below patch >> applied: >> 6dffdbc mmc: sdhci: Add the programmable clock mode support >> >> Signed-off-by: Kever Yang >> --- >> >> arch/arm/mach-rockchip/rk3399/rk3399.c | 14 ++ >> 1 file changed, 14 insertions(+) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/2] rockchip: doc: add GPT partition layout
On 7 October 2016 at 23:47, Jacob Chenwrote: > A simple introduction. > > Signed-off-by: Jacob Chen > Acked-by: Simon Glass > --- > > Changes in v3: None > Changes in v2: None > > doc/README.rockchip | 11 +-- > 1 file changed, 9 insertions(+), 2 deletions(-) Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/2] rockchip: use rockchip linux partitions layout
On 8 October 2016 at 01:38, Kever Yangwrote: > Hi Jacob, > > > On 10/08/2016 01:47 PM, Jacob Chen wrote: >> >> Unify the partitions of each chip then it will be more easy for us to >> write scripts, tools or guides for rockchip chips. >> >> Those extra partitions mostly are used to be compatible with our >> internal loaders (such as miniloader which was same as spl, or >> android loader then we can support dual boot) >> >> Signed-off-by: Jacob Chen >> --- >> >> Changes in v3: >> - correct the copyright >> >> Changes in v2: >> - put macro in a rockchip_common.h >> >> include/configs/rk3036_common.h | 17 + >> include/configs/rk3288_common.h | 17 + >> include/configs/rk3399_common.h | 16 ++-- >> include/configs/rockchip-common.h | 35 >> +++ >> 4 files changed, 39 insertions(+), 46 deletions(-) >> create mode 100644 include/configs/rockchip-common.h >> >> diff --git a/include/configs/rk3036_common.h >> b/include/configs/rk3036_common.h >> index 73830e4..29d56ff 100644 >> --- a/include/configs/rk3036_common.h >> +++ b/include/configs/rk3036_common.h >> @@ -7,6 +7,7 @@ >> #define __CONFIG_RK3036_COMMON_H >> #include >> +#include "rockchip-common.h" >> #define CONFIG_SYS_NO_FLASH >> #define CONFIG_NR_DRAM_BANKS 1 >> @@ -79,11 +80,6 @@ >> #define CONFIG_G_DNL_VENDOR_NUM 0x2207 >> #define CONFIG_G_DNL_PRODUCT_NUM 0x310a >> -/* Enable gpt partition table */ >> -#define CONFIG_CMD_GPT >> - >> -#include >> - >> #define ENV_MEM_LAYOUT_SETTINGS \ >> "scriptaddr=0x6000\0" \ >> "pxefile_addr_r=0x6010\0" \ >> @@ -91,17 +87,6 @@ >> "kernel_addr_r=0x6200\0" \ >> "ramdisk_addr_r=0x6400\0" >> -#define CONFIG_RANDOM_UUID >> -#define PARTS_DEFAULT \ >> - "uuid_disk=${uuid_gpt_disk};" \ >> - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ >> - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ >> - >> -/* First try to boot from SD (index 0), then eMMC (index 1 */ >> -#define BOOT_TARGET_DEVICES(func) \ >> - func(MMC, mmc, 0) \ >> - func(MMC, mmc, 1) >> - >> #include >> /* Linux fails to load the fdt if it's loaded above 512M on a >> evb-rk3036 board, >> diff --git a/include/configs/rk3288_common.h >> b/include/configs/rk3288_common.h >> index 9ddfe1d..630f218 100644 >> --- a/include/configs/rk3288_common.h >> +++ b/include/configs/rk3288_common.h >> @@ -8,6 +8,7 @@ >> #define __CONFIG_RK3288_COMMON_H >> #include >> +#include "rockchip-common.h" >> #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY >> #define CONFIG_SYS_NO_FLASH >> @@ -96,11 +97,6 @@ >> #define CONFIG_G_DNL_VENDOR_NUM 0x2207 >> #define CONFIG_G_DNL_PRODUCT_NUM 0x320a >> -/* Enable gpt partition table */ >> -#define CONFIG_CMD_GPT >> - >> -#include >> - >> #define ENV_MEM_LAYOUT_SETTINGS \ >> "scriptaddr=0x\0" \ >> "pxefile_addr_r=0x0010\0" \ >> @@ -108,17 +104,6 @@ >> "kernel_addr_r=0x0200\0" \ >> "ramdisk_addr_r=0x0400\0" >> -#define CONFIG_RANDOM_UUID >> -#define PARTS_DEFAULT \ >> - "uuid_disk=${uuid_gpt_disk};" \ >> - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ >> - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ >> - >> -/* First try to boot from SD (index 0), then eMMC (index 1 */ >> -#define BOOT_TARGET_DEVICES(func) \ >> - func(MMC, mmc, 0) \ >> - func(MMC, mmc, 1) >> - >> #include >> /* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 >> board, so >> diff --git a/include/configs/rk3399_common.h >> b/include/configs/rk3399_common.h >> index b026122..68b9391 100644 >> --- a/include/configs/rk3399_common.h >> +++ b/include/configs/rk3399_common.h >> @@ -7,6 +7,8 @@ >> #ifndef __CONFIG_RK3399_COMMON_H >> #define __CONFIG_RK3399_COMMON_H >> +#include "rockchip-common.h" >> + >> #define CONFIG_SYS_NO_FLASH >> #define CONFIG_NR_DRAM_BANKS 1 >> #define CONFIG_ENV_SIZE 0x2000 >> @@ -53,7 +55,6 @@ >> #define CONFIG_SF_DEFAULT_SPEED 2000 >> #ifndef CONFIG_SPL_BUILD >> -#include >> #define ENV_MEM_LAYOUT_SETTINGS \ >> "scriptaddr=0x\0" \ >> @@ -62,19 +63,6 @@ >> "kernel_addr_r=0x0200\0" \ >> "ramdisk_addr_r=0x0400\0" >> -#define CONFIG_CMD_GPT >> -#define CONFIG_RANDOM_UUID >> -#define CONFIG_PARTITION_UUIDS >> -#define PARTS_DEFAULT \ >> - "uuid_disk=${uuid_gpt_disk};" \ >> - "name=boot,start=16M,size=32M,bootable;" \ >> - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ >> - >> -/* First try to boot from SD (index 0), then eMMC (index 1) */ >> -#define BOOT_TARGET_DEVICES(func) \ >> - func(MMC, mmc, 0) \ >> - func(MMC, mmc, 1) >> - >> #include >> #define
Re: [U-Boot] [PATCH v3 2/3] rk3288: sdram: auto-detect the capacity
On 10 October 2016 at 11:12, Vagrant Cascadianwrote: > On 2016-10-07, Kever Yang wrote: >> Add support for rk3288 dram capacity auto detect, support DDR3 and >> LPDDR3, DDR2 is not supported. >> The program will automatically detect: >> - channel number >> - rank number >> - column address number >> - row address number >> >> The dts file do not need to describe those info after apply this patch. >> >> Signed-off-by: Kever Yang >> Tested-by: Simon Glass >> Tested-by: Vagrant Cascadian >> --- >> >> Changes in v3: >> - add error report and return value when error happen >> - add comments for stride and address bits. >> >> Changes in v2: >> - update code for OF_PLATDATA enabled >> - bug fix for ddrconfig > > Tested the updated v3 patch with u-boot 2016.11-rc1, using both firefly > 2GB and 4GB variants. Both detect appropriate amount of ram and > otherwise work fine. > > Tested-by: Vagrant Cascadian > > live well, > vagrant Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 3/3] dts: rk3288: remove node in dmc which not need anymore
On 7 October 2016 at 03:47, Kever Yangwrote: > Since we implement the dram capacity auto detect, we don't > need to set the channel number and sdram-channel in dts. > > Signed-off-by: Kever Yang > Acked-by: Simon Glass > Tested-by: Simon Glass > Tested-by: Vagrant Cascadian > --- > > Changes in v3: None > Changes in v2: None > > arch/arm/dts/rk3288-evb.dts | 3 --- > arch/arm/dts/rk3288-fennec.dts | 3 --- > arch/arm/dts/rk3288-firefly.dts | 2 -- > arch/arm/dts/rk3288-miniarm.dts | 3 --- > arch/arm/dts/rk3288-popmetal.dts | 3 --- > arch/arm/dts/rk3288-rock2-square.dts | 2 -- > arch/arm/dts/rk3288-veyron.dtsi | 2 -- > 7 files changed, 18 deletions(-) Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] rk3399: disable the clock multiplier support when SoC init
On 7 October 2016 at 01:56, Kever Yangwrote: > The Clock Multiplier in rk3399 EMMC programmable clock generator > is broken, we can remove its support from SoC GRF register. > > Without this patch, rk3399 emmc driver is not work after below patch > applied: > 6dffdbc mmc: sdhci: Add the programmable clock mode support > > Signed-off-by: Kever Yang > --- > > arch/arm/mach-rockchip/rk3399/rk3399.c | 14 ++ > 1 file changed, 14 insertions(+) Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/3] rk3288: config change for enable dram capacity auto-detect.
On 7 October 2016 at 03:47, Kever Yangwrote: > Enable ROCKCHIP_SPL_BACK_TO_BROM and disable CONFIG_SPL_MMC_SUPPORT > to save memory in order to enable add source code for dram capacity > auto-detect. > > Signed-off-by: Kever Yang > --- > > Changes in v3: > - move the config into defconfig file > > Changes in v2: None > > configs/evb-rk3288_defconfig | 1 + > configs/fennec-rk3288_defconfig | 1 + > configs/miniarm-rk3288_defconfig | 1 + > configs/popmetal-rk3288_defconfig | 1 + > 4 files changed, 4 insertions(+) Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] evb-rk3399: config: set emmc as default boot dev
On 7 October 2016 at 02:05, Kever Yangwrote: > rk3399 has two mmc dev controller: > mmc 0: SD card; > mmc 1: EMMC > > U-Boot will scan the mmc boot device configured by CONFIG_SYS_MMC_ENV_DEV, > since evb has emmc on board, let's set the EMMC as default. > > Signed-off-by: Kever Yang > --- > > include/configs/evb_rk3399.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] rk3288: fix reg address for GRF_SOC_CON2
On 7 October 2016 at 01:59, Kever Yangwrote: > The GRF base address is missing, fix it. > > Signed-off-by: Kever Yang > --- > > arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] rk3288: kconfig: remove duplicate definition of SPL_MMC_SUPPORT
On 8 October 2016 at 01:23, Kever Yangwrote: > SPL_MMC_SUPPORT defined in rockchip top level Kconfig instead of > inside rk3288 and default to disable if ROCKCHIP_SPL_BACK_TO_BROM > defined. > > > Signed-off-by: Kever Yang > --- > > arch/arm/mach-rockchip/rk3288/Kconfig | 3 --- > 1 file changed, 3 deletions(-) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] OMAP3: omap3_logic: Add scripts to boot over network.
Not all networks have a DHCP server configured properly, so these scripts make it easier to boot in that scenario. Signed-off-by: Adam Forddiff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 95ff5c3..0827ebe 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -189,6 +189,12 @@ "${optargs} " \ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ + "nfsargs=run setconsole; setenv serverip ${tftpserver}; " \ + "setenv bootargs console=${console} root=/dev/nfs " \ + "nfsroot=${nfsrootpath} " \ + "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \ + "nfsrootpath=/opt/nfs-exports/omap\0" \ + "autoload=no\0" \ "fdtaddr=0x8600\0" \ "loadfdtimage=mmc rescan; " \ "fatload mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \ @@ -213,14 +219,21 @@ "run loadzimage; " \ "run loadramdisk; " \ "run loadfdtimage; " \ - "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr}\0; " \ + "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr};\0" \ "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \ "run ramargs; " \ "run common_bootargs; " \ "run dump_bootargs; " \ - "tftpboot ${loadaddr} ${uimage}; " \ + "tftpboot ${loadaddr} ${zimage}; " \ "tftpboot ${ramdiskaddr} ${ramdiskimage}; " \ - "bootm ${loadaddr} ${ramdiskaddr}\0" + "bootm ${loadaddr} ${ramdiskaddr}\0" \ + "tftpbootz=echo 'Booting kernel NFS rootfs...'; " \ + "dhcp;" \ + "run nfsargs;" \ + "run common_bootargs;" \ + "run dump_bootargs;" \ + "tftpboot $loadaddr zImage;" \ + "bootz $loadaddr\0" #define CONFIG_BOOTCOMMAND \ "run autoboot" -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/3] rockchip: rk3399: Move rockchip_get_cru() out of the driver
On 7 October 2016 at 20:54, Kever Yangwrote: > Hi Simon, > > > On 10/02/2016 10:04 AM, Simon Glass wrote: >> >> This function is called from outside the driver. It should be placed into >> common SoC code. Move it. >> >> Also rename the driver symbol to be more consistent with the other >> rockchip >> clock drivers. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v2: None >> >> arch/arm/include/asm/arch-rockchip/cru_rk3399.h | 6 + >> arch/arm/mach-rockchip/rk3399/Makefile | 1 + >> arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 33 >> + >> drivers/clk/rockchip/clk_rk3399.c | 24 +- >> 4 files changed, 41 insertions(+), 23 deletions(-) >> create mode 100644 arch/arm/mach-rockchip/rk3399/clk_rk3399.c >> [...] > Reviewed-by: Kever Yang Applied to u-boot-rockchip ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/3] rockchip: rk3288: Move rockchip_get_cru() out of the driver
On 7 October 2016 at 20:55, Kever Yangwrote: > Hi Simon, > > > On 10/02/2016 10:04 AM, Simon Glass wrote: >> >> This function is called from outside the driver. It should be placed into >> common SoC code. Move it. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v2: >> - Rebase to mainline and fix resulting build error >> - Add a similar change for rk3036 and rk3399 >> >> arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 7 +++ >> arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 16 >> drivers/clk/rockchip/clk_rk3288.c | 21 >> - >> 3 files changed, 23 insertions(+), 21 deletions(-) [...] > > > Reviewed-by: Kever Yang > > Thanks, > - Kever > Applied to u-boot-rockchip ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] clk: rk3399: fix rockchip_get_cru
On 27 September 2016 at 11:55, Simon Glasswrote: > On 27 September 2016 at 01:48, Jacob Chen wrote: >> clk_rk3399 is driver name, not device name >> >> Signed-off-by: Jacob Chen >> --- >> >> drivers/clk/rockchip/clk_rk3399.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) > > Acked-by: Simon Glass Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] rockchip: rk3036: Move rockchip_get_cru() out of the driver
On 7 October 2016 at 20:54, Kever Yangwrote: > Hi Simon, > > > On 10/02/2016 10:04 AM, Simon Glass wrote: >> >> This function is called from outside the driver. It should be placed into >> common SoC code. Move it. >> >> Also rename the driver symbol to be more consistent with the other >> rockchip >> clock drivers. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v2: None >> >> arch/arm/include/asm/arch-rockchip/cru_rk3036.h | 6 + >> arch/arm/mach-rockchip/rk3036/Makefile | 2 ++ >> arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 33 >> + >> drivers/clk/rockchip/clk_rk3036.c | 24 +- >> 4 files changed, 42 insertions(+), 23 deletions(-) >> create mode 100644 arch/arm/mach-rockchip/rk3036/clk_rk3036.c >> [..] > Reviewed-by: Kever Yang > > Thanks, > - Kever > Applied to u-boot-rockchip ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] rockchip: enable SPL_OF_PLATDATA for rk3288 board
Hi, On 8 October 2016 at 02:28, 陈豪wrote: > In patch "rk3288: config change for enable dram capacity auto-detect", > Kever have use CONFIG_ROCKCHIP_SPL_BACK_TO_BROM to reduce spl size, so > this patch is no longer needed. OK, then I will drop this patch for now. > > 2016-09-28 23:46 GMT+08:00 Simon Glass : >> On 28 September 2016 at 00:35, Jacob Chen wrote: >>> It seems ddr auto detect make SPL image to large. >>> So we have to use SPL_OF_PLATDATA to reduce size. >>> >>> Signed-off-by: Jacob Chen >>> --- >>> >>> configs/evb-rk3288_defconfig | 4 >>> configs/fennec-rk3288_defconfig | 3 +++ >>> configs/miniarm-rk3288_defconfig | 3 +++ >>> 3 files changed, 10 insertions(+) >> >> Acked-by: Simon Glass >> ___ >> U-Boot mailing list >> U-Boot@lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/4] RK3288 needs fdt and initrd below 256M now.
On 27 August 2016 at 11:03, Sandy Pattersonwrote: > > > On Sat, Aug 27, 2016 at 12:06 PM, Simon Glass wrote: >> >> Hi Sandy, >> >> On 11 July 2016 at 11:38, Sandy Patterson >> wrote: >> > I am not sure why this limit is changing. But my kernel >> > doesn't load when it's above 256. This was testing on the >> > rock2 board. >> > >> > Signed-off-by: Sandy Patterson >> > --- >> > >> > include/configs/rk3288_common.h | 6 +++--- >> > 1 file changed, 3 insertions(+), 3 deletions(-) >> >> Is this patch not needed now? > > > I just retested with the latest from u-boot.git/master . This patch is still > required for booing on rock2. I tested with the same mainline kernel version > as before (4.7.0-rc6). I don't know why, and I haven't tried searching back > through the history to see if it used to work and what changed, sorry. Still not tested tags for this. Updated commit subject and: Applied to u-boot-rockchip, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] tpm: tpm_tis_lpc: Add support for AT97SC3204
Hi George, On 14 October 2016 at 15:41, George McCollisterwrote: > > The Atmel AT97SC3204 is also TIS compliant. > Modify the tpm_tis_lpc driver to check for the vid/did used by the > Atmel AT97SC3204 and report an appropriate description. > > Signed-off-by: George McCollister > --- > drivers/tpm/tpm_tis_lpc.c | 37 - > 1 file changed, 28 insertions(+), 9 deletions(-) > > diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c > index b4efbb5..316993a 100644 > --- a/drivers/tpm/tpm_tis_lpc.c > +++ b/drivers/tpm/tpm_tis_lpc.c > @@ -21,6 +21,21 @@ > > #define PREFIX "lpc_tpm: " > > +enum i2c_chip_type { > + SLB9635, > + AT97SC3204, > +}; > + > +static const char * const chip_name[] = { > + [SLB9635] = "Infineon SLB9635 TT 1.2", > + [AT97SC3204] = "Atmel AT97SC3204", > +}; > + > +static const u32 chip_didvid[] = { > + [SLB9635] = 0xb15d1, > + [AT97SC3204] = 0x32041114, > +}; > + > struct tpm_locality { > u32 access; > u8 padding0[4]; > @@ -146,9 +161,9 @@ static int tis_wait_reg(struct tpm_tis_lpc_priv *priv, > u32 *reg, u8 mask, > static int tpm_tis_lpc_probe(struct udevice *dev) > { > struct tpm_tis_lpc_priv *priv = dev_get_priv(dev); > - u32 vid, did; > fdt_addr_t addr; > u32 didvid; > + ulong chip_type = dev_get_driver_data(dev); > > addr = dev_get_addr(dev); > if (addr == FDT_ADDR_T_NONE) > @@ -156,15 +171,16 @@ static int tpm_tis_lpc_probe(struct udevice *dev) > priv->regs = map_sysmem(addr, 0); > didvid = tpm_read_word(priv, >regs[0].did_vid); > > - vid = didvid & 0x; > - did = (didvid >> 16) & 0x; > - if (vid != 0x15d1 || did != 0xb) { > + if (didvid == chip_didvid[chip_type]) { > + debug("Found TPM: %s\n", chip_name[chip_type]); > + } else { Can you put this error clause first, so that the debug() remains where it is? > + u32 vid, did; > + vid = didvid & 0x; > + did = (didvid >> 16) & 0x; > debug("Invalid vendor/device ID %04x/%04x\n", vid, did); > return -ENOSYS; I think we should change this to -ENODEV as it is a missing device, not a missing system call. Or maybe -ENOENT? > } > > - debug("Found TPM %s by %s\n", "SLB9635 TT 1.2", "Infineon"); > - > return 0; > } > > @@ -421,11 +437,13 @@ static int tpm_tis_lpc_close(struct udevice *dev) > > static int tpm_tis_get_desc(struct udevice *dev, char *buf, int size) > { > + ulong chip_type = dev_get_driver_data(dev); > + > if (size < 50) > return -ENOSPC; > > - return snprintf(buf, size, "1.2 TPM (vendor %s, chip %s)", > - "Infineon", "SLB9635 TT 1.2"); > + return snprintf(buf, size, "1.2 TPM (%s)", > + chip_name[chip_type]); > } > > > @@ -438,7 +456,8 @@ static const struct tpm_ops tpm_tis_lpc_ops = { > }; > > static const struct udevice_id tpm_tis_lpc_ids[] = { > - { .compatible = "infineon,slb9635lpc" }, > + { .compatible = "infineon,slb9635lpc", .data = SLB9635 }, > + { .compatible = "atmel,at97sc3204", .data = AT97SC3204 }, > { } > }; > > -- > 2.9.3 > Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm
CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area. Cc: Simon GlassCc: Marek Vasut Cc: Masahiro Yamada Signed-off-by: Jagan Teki --- drivers/usb/host/ehci-hcd.c | 8 drivers/usb/host/xhci.c | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 13aa70d..d8dc827 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -21,10 +21,6 @@ #include "ehci.h" -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif - /* * EHCI spec page 20 says that the HC may take up to 16 uFrames (= 4ms) to halt. * Let's time out after 8 to have a little safety margin on top of that. @@ -32,6 +28,10 @@ #define HCHALT_TIMEOUT (8 * 1000) #ifndef CONFIG_DM_USB +# ifndef CONFIG_USB_MAX_CONTROLLER_COUNT +# define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +# endif + static struct ehci_ctrl ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; #endif diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 3201177..bb276da 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -31,10 +31,6 @@ #include #include "xhci.h" -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif - static struct descriptor { struct usb_hub_descriptor hub; struct usb_device_descriptor device; @@ -110,6 +106,10 @@ static struct descriptor { }; #ifndef CONFIG_DM_USB +# ifndef CONFIG_USB_MAX_CONTROLLER_COUNT +# define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +# endif + static struct xhci_ctrl xhcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; #endif -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] OMAP3: omap3_logic: Remove LCD preboot info
On Sat, Oct 15, 2016 at 06:23:11AM -0500, Adam Ford wrote: > The LCD isn't supported in U-Boot and the LCD is now configured in > the device tree, so this code is pointless. > > V2: Eliminiate erroneous newline. > > Signed-off-by: Adam Ford> > diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h > index a7649ca..95ff5c3 100644 Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,v1] spl: move FDT_FIXUP_PARTITIONS to Kconfig
On Thu, Oct 06, 2016 at 07:31:45AM +0200, Heiko Schocher wrote: > Move FDT_FIXUP_PARTITIONS to Kconfig and cleanup existing > uses. > > Signed-off-by: Heiko SchocherApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,v1,2/2] spl: move SYS_OS_BASE to Kconfig
On Thu, Oct 06, 2016 at 07:55:16AM +0200, Heiko Schocher wrote: > Move SYS_OS_BASE to Kconfig and cleanup existing > uses. > > Signed-off-by: Heiko SchocherAfter also fixing a4m2k (a variant of a3m071 that I guess moveconfig missed due to it being selected via CONFIG_SYS_EXTRA_OPTIONS), applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,v1,1/2] spl: move SPL_OS_BOOT to Kconfig
On Thu, Oct 06, 2016 at 07:55:15AM +0200, Heiko Schocher wrote: > Move SPL_OS_BOOT to Kconfig and cleanup existing > uses. > > Signed-off-by: Heiko SchocherApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2] OMAP3: omap3_logic: Remove LCD preboot info
The LCD isn't supported in U-Boot and the LCD is now configured in the device tree, so this code is pointless. V2: Eliminiate erroneous newline. Signed-off-by: Adam Forddiff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index a7649ca..95ff5c3 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -128,27 +128,7 @@ /* Environment information */ -/* - * PREBOOT assumes the 4.3" display is attached. User can interrupt - * and modify display variable to suit their needs. - */ #define CONFIG_PREBOOT \ - "echo ==NOTICE;"\ - "echo \"The u-boot environment is not set.\";" \ - "echo \"If using a display a valid display variable for your panel\";" \ - "echo \"needs to be set.\";"\ - "echo \"Valid display options are:\";" \ - "echo \" 2 == LQ121S1DG31 TFT SVGA(12.1) Sharp\";"\ - "echo \" 3 == LQ036Q1DA01 TFT QVGA(3.6) Sharp w/ASIC\";" \ - "echo \" 5 == LQ064D343 TFT VGA (6.4) Sharp\";"\ - "echo \" 7 == LQ10D368TFT VGA (10.4) Sharp\";"\ - "echo \" 15 == LQ043T1DG01 TFT WQVGA (4.3) Sharp (DEFAULT)\";" \ - "echo \" vga[-dvi or -hdmi]LCD VGA 640x480\";" \ - "echo \" svga[-dvi or -hdmi] LCD SVGA800x600\";" \ - "echo \" xga[-dvi or -hdmi]LCD XGA 1024x768\";" \ - "echo \" 720p[-dvi or -hdmi] LCD 720P1280x720\";" \ - "echo \"Defaulting to 4.3 LCD panel (display=15).\";" \ - "setenv display 15;"\ "setenv preboot;" \ "nand unlock;" \ "saveenv;" -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] OMAP3: omap3_logic: Remove LCD preboot info
The LCD isn't supported in U-Boot and the LCD is now configured in the device tree, so this code is pointless. Signed-off-by: Adam Forddiff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index a7649ca..ff7bf92 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -128,27 +128,8 @@ /* Environment information */ -/* - * PREBOOT assumes the 4.3" display is attached. User can interrupt - * and modify display variable to suit their needs. - */ #define CONFIG_PREBOOT \ - "echo ==NOTICE;"\ - "echo \"The u-boot environment is not set.\";" \ - "echo \"If using a display a valid display variable for your panel\";" \ - "echo \"needs to be set.\";"\ - "echo \"Valid display options are:\";" \ - "echo \" 2 == LQ121S1DG31 TFT SVGA(12.1) Sharp\";"\ - "echo \" 3 == LQ036Q1DA01 TFT QVGA(3.6) Sharp w/ASIC\";" \ - "echo \" 5 == LQ064D343 TFT VGA (6.4) Sharp\";"\ - "echo \" 7 == LQ10D368TFT VGA (10.4) Sharp\";"\ - "echo \" 15 == LQ043T1DG01 TFT WQVGA (4.3) Sharp (DEFAULT)\";" \ - "echo \" vga[-dvi or -hdmi]LCD VGA 640x480\";" \ - "echo \" svga[-dvi or -hdmi] LCD SVGA800x600\";" \ - "echo \" xga[-dvi or -hdmi]LCD XGA 1024x768\";" \ - "echo \" 720p[-dvi or -hdmi] LCD 720P1280x720\";" \ - "echo \"Defaulting to 4.3 LCD panel (display=15).\";" \ - "setenv display 15;"\ + "setenv preboot;" \ "nand unlock;" \ "saveenv;" -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5 2/7] efi_loader: AArch64: Run EFI payloads in EL2 if U-Boot runs in EL3
Some boards decided not to run ATF or other secure firmware in EL3, so they instead run U-Boot there. The uEFI spec doesn't know what EL3 is though - it only knows about EL2 and EL1. So if we see that we're running in EL3, let's get into EL2 to make payloads happy. Signed-off-by: Alexander Graf--- v4 -> v5: - Remove manual ttbr / tcr copy - Regenerate page tables in EL2, getting us non-secured page tables --- cmd/bootefi.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 8714666..32148d7 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -224,6 +224,17 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt) return status == EFI_SUCCESS ? 0 : -EINVAL; } +#ifdef CONFIG_ARM64 + /* On AArch64 we need to make sure we call our payload in < EL3 */ + if (current_el() == 3) { + smp_kick_all_cpus(); + dcache_disable(); /* flush cache before switch to EL2 */ + armv8_switch_to_el2(); + /* Enable caches again */ + dcache_enable(); + } +#endif + return entry(_image_info, ); } -- 1.8.5.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5 5/7] armv8: ls2080a: Declare spin tables as reserved for efi loader
The efi loader code has its own memory map, so it needs to be aware where the spin tables are located, to ensure that no code writes into those regions. Signed-off-by: Alexander Graf--- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 1a8321b..facfcca 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -105,6 +106,11 @@ remove_psci_node: fdt_add_mem_rsv(blob, (uintptr_t)_boot_code, *boot_code_size); +#ifdef CONFIG_EFI_LOADER + efi_add_memory_map((uintptr_t)_boot_code, + ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT, + EFI_RESERVED_MEMORY_TYPE, false); +#endif } #endif -- 1.8.5.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5 1/7] ls2080: Exit dpaa only right before exiting U-Boot
On ls2080 we have a separate network fabric component which we need to shut down before we enter Linux (or any other OS). Along with that also comes configuration of the fabric using a description file. Today we always stop and configure the fabric in the boot script and (again) exit it on device tree generation. This works ok for the normal booti case, but with bootefi the payload we're running may still want to access the network. So let's add a new fsl_mc command that defers configuration and stopping the hardware to when we actually exit U-Boot, so that we can still use the fabric from an EFI payload. For existing boot scripts, nothing should change with this patch. Signed-off-by: Alexander Graf--- v3 -> v4: - Move code into generic quiesce weak function - Exit device for real when going to Linux - Only apply DPL if we have something to apply --- arch/arm/include/asm/u-boot-arm.h | 1 + arch/arm/lib/bootm.c| 7 +++ board/freescale/ls2080a/ls2080a.c | 6 +- board/freescale/ls2080aqds/ls2080aqds.c | 11 +-- board/freescale/ls2080ardb/ls2080ardb.c | 11 +-- drivers/net/fsl-mc/mc.c | 24 ++-- lib/efi_loader/efi_boottime.c | 2 ++ 7 files changed, 47 insertions(+), 15 deletions(-) diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 414042d..023daf5 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -37,6 +37,7 @@ int arch_early_init_r(void); /* board/.../... */ intboard_init(void); void dram_init_banksize (void); +voidboard_quiesce_devices(void); /* cpu/.../interrupt.c */ intarch_interrupt_init (void); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 53c3141..dedcd1e 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -64,6 +64,10 @@ void arch_lmb_reserve(struct lmb *lmb) gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size - sp); } +__weak void board_quiesce_devices(void) +{ +} + /** * announce_and_cleanup() - Print message and prepare for kernel boot * @@ -84,6 +88,9 @@ static void announce_and_cleanup(int fake) #ifdef CONFIG_USB_DEVICE udc_disconnect(); #endif + + board_quiesce_devices(); + cleanup_before_linux(); } diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c index d0a88d4..4f9b9c8 100644 --- a/board/freescale/ls2080a/ls2080a.c +++ b/board/freescale/ls2080a/ls2080a.c @@ -102,6 +102,11 @@ void fdt_fixup_board_enet(void *fdt) else fdt_status_fail(fdt, offset); } + +void board_quiesce_devices(void) +{ + fsl_mc_ldpaa_exit(gd->bd); +} #endif #ifdef CONFIG_OF_BOARD_SETUP @@ -122,7 +127,6 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); - fsl_mc_ldpaa_exit(bd); #endif return 0; diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index d07ca18..73a61fd 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -292,14 +292,16 @@ void fdt_fixup_board_enet(void *fdt) else fdt_status_fail(fdt, offset); } + +void board_quiesce_devices(void) +{ + fsl_mc_ldpaa_exit(gd->bd); +} #endif #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, bd_t *bd) { -#ifdef CONFIG_FSL_MC_ENET - int err; -#endif u64 base[CONFIG_NR_DRAM_BANKS]; u64 size[CONFIG_NR_DRAM_BANKS]; @@ -317,9 +319,6 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); - err = fsl_mc_ldpaa_exit(bd); - if (err) - return err; #endif return 0; diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 83d9e7e..fab44b9 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -256,14 +256,16 @@ void fdt_fixup_board_enet(void *fdt) else fdt_status_fail(fdt, offset); } + +void board_quiesce_devices(void) +{ + fsl_mc_ldpaa_exit(gd->bd); +} #endif #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, bd_t *bd) { -#ifdef CONFIG_FSL_MC_ENET - int err; -#endif u64 base[CONFIG_NR_DRAM_BANKS]; u64 size[CONFIG_NR_DRAM_BANKS]; @@ -281,9 +283,6 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); - err = fsl_mc_ldpaa_exit(bd); - if (err) - return err; #endif return 0; diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 1811b0f..46b8a6b 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -40,6 +40,7 @@ int child_dprc_id; struct fsl_dpbp_obj *dflt_dpbp = NULL; struct fsl_dpio_obj *dflt_dpio =
[U-Boot] [PATCH v5 7/7] efi_loader: Declare secure memory as reserved
Some systems may implemente TrustZone (EL3) in U-Boot. Those systems reserve some memory that U-Boot is aware of as secure. For those systems, mask out that secure memory in the EFI memory map, as it's not usable from EL2 or EL1. Signed-off-by: Alexander Graf--- v4 -> v5: - Use gd->arch.secure_ram --- lib/efi_loader/efi_memory.c | 15 +++ 1 file changed, 15 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 95aa590..4966e48 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -474,5 +474,20 @@ int efi_memory_init(void) efi_bounce_buffer = (void*)(uintptr_t)efi_bounce_buffer_addr; #endif +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE + /* Declare secure ram as reserved */ +if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) { + uint64_t secure_start = gd->arch.secure_ram; + uint64_t secure_pages = CONFIG_SYS_MEM_RESERVE_SECURE; + + secure_start &= MEM_RESERVE_SECURE_ADDR_MASK; + secure_start &= ~EFI_PAGE_MASK; + secure_pages = (secure_pages + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; + + efi_add_memory_map(secure_start, secure_pages, + EFI_RESERVED_MEMORY_TYPE, false); +} +#endif + return 0; } -- 1.8.5.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5 6/7] armv8: fsl-layerscape: Add support for efi_loader RTS reset
When implementing efi loader support, we can expose runtime services for payloads. One such service is CPU reset. This patch implements RTS CPU reset support for layerscape systems. Signed-off-by: Alexander Graf--- v4 -> v5: - Use __efi_runtime tags --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 33 +++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index b7a2e0c..0b516e3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -17,6 +17,7 @@ #ifdef CONFIG_MP #include #endif +#include #include #include #ifdef CONFIG_FSL_ESDHC @@ -462,9 +463,10 @@ int timer_init(void) return 0; } -void reset_cpu(ulong addr) +__efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR; + +void __efi_runtime reset_cpu(ulong addr) { - u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR; u32 val; /* Raise RESET_REQ_B */ @@ -473,6 +475,33 @@ void reset_cpu(ulong addr) scfg_out32(rstcr, val); } +#ifdef CONFIG_EFI_LOADER + +void __efi_runtime EFIAPI efi_reset_system( + enum efi_reset_type reset_type, + efi_status_t reset_status, + unsigned long data_size, void *reset_data) +{ + switch (reset_type) { + case EFI_RESET_COLD: + case EFI_RESET_WARM: + reset_cpu(0); + break; + case EFI_RESET_SHUTDOWN: + /* Nothing we can do */ + break; + } + + while (1) { } +} + +void efi_reset_system_init(void) +{ + efi_add_runtime_mmio(, sizeof(*rstcr)); +} + +#endif + phys_size_t board_reserve_ram_top(phys_size_t ram_size) { phys_size_t ram_top = ram_size; -- 1.8.5.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5 4/7] ls2080ardb: Convert to distro boot
Most new systems in U-Boot these days make use of the generic "distro" framework which allows a user to have U-Boot scan for a bootable OS on all available media types. This patch extends the LS2080ARDB board to use that framework if the hard coded NOR flash location does not contain a bootable image. Signed-off-by: Alexander Graf--- v1 -> v2: - Boot NOR flash before distro boot v2 -> v3: - Actually run distro boot (s/&&/||/ after bootm) v3 -> v4: - Add CONFIG_CMD_FS_GENERIC to defconfig v4 -> v5: - Add qspi board - Don't overwrite ethact --- configs/ls2080a_emu_defconfig| 1 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig| 1 + configs/ls2080aqds_qspi_defconfig| 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig| 1 + include/configs/ls2080ardb.h | 25 - 10 files changed, 33 insertions(+), 1 deletion(-) diff --git a/configs/ls2080a_emu_defconfig b/configs/ls2080a_emu_defconfig index e3c02fb..293e682 100644 --- a/configs/ls2080a_emu_defconfig +++ b/configs/ls2080a_emu_defconfig @@ -29,3 +29,4 @@ CONFIG_CMD_CACHE=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080a_simu_defconfig b/configs/ls2080a_simu_defconfig index 081f810..6af6a66 100644 --- a/configs/ls2080a_simu_defconfig +++ b/configs/ls2080a_simu_defconfig @@ -32,3 +32,4 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index 31e69b4..6eac575 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -38,3 +38,4 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index af52818..64d90e8 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -36,3 +36,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index f09809d..6431d92 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -45,3 +45,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index 2b24a94..edcab88 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -37,3 +37,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index a62d864..fe217a4 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -38,3 +38,4 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index bbf2a74..e26ae23 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -36,3 +36,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 98a00e2..112fcc9 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -41,3 +41,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_FS_GENERIC=y diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index ee0f5fc..045cee6 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -318,10 +318,24 @@ unsigned long get_board_sys_clk(void); #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 +#undef CONFIG_CMDLINE_EDITING +#include + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(SCSI, scsi, 0) \ + func(DHCP, dhcp, na) +#include + /* Initial environment variables */ #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0"\ + "scriptaddr=0x8080\0" \ + "kernel_addr_r=0x8100\0"\ + "pxefile_addr_r=0x8100\0" \ +
[U-Boot] [PATCH v5 0/7] LS2080ARDB: Enable EFI boot support
We now have EFI support in U-Boot which worked out of the box on all systems that I tried it on so far. Except for the LS2080ARDB. With this patch set I can successfully boot grub2 and Linux from there on such a system - even using PXE. This patch set depends on the efi-next queue and the efi runtime rename patch. For easy pulling, you can find the fully applied tree here: https://github.com/agraf/u-boot.git ls2085-efi-support-v5 v3 -> v4: - Add CONFIG_CMD_FS_GENERIC to defconfig - Move code into generic quiesce weak function - Exit device for real when going to Linux - Only apply DPL if we have something to apply - New: armv8: ls2080a: Declare spin tables as reserved for efi loader - New: efi_loader: Allow boards to implement get_time and reset_system - New: armv8: fsl-layerscape: Add support for efi_loader RTS reset - New: efi_loader: Declare secure memory as reserved - New: efi_loader: Allow bouncing for network v4 -> v5: - Drop patches that are in the efi queue already - efi_loader: Allow boards to implement get_time and reset_system - efi_loader: Allow bouncing for network - Remove manual ttbr / tcr copy - Regenerate page tables in EL2, getting us non-secured page tables - Add qspi board - Don't overwrite ethact - Use __efi_runtime tags - Use gd->arch.secure_ram Alexander Graf (7): ls2080: Exit dpaa only right before exiting U-Boot efi_loader: AArch64: Run EFI payloads in EL2 if U-Boot runs in EL3 ls2080ardb: Reserve DP-DDR RAM ls2080ardb: Convert to distro boot armv8: ls2080a: Declare spin tables as reserved for efi loader armv8: fsl-layerscape: Add support for efi_loader RTS reset efi_loader: Declare secure memory as reserved arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 33 ++-- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 6 ++ arch/arm/include/asm/u-boot-arm.h| 1 + arch/arm/lib/bootm.c | 7 +++ board/freescale/ls2080a/ls2080a.c| 6 +- board/freescale/ls2080aqds/ls2080aqds.c | 11 +-- board/freescale/ls2080ardb/ls2080ardb.c | 20 +-- cmd/bootefi.c| 11 +++ configs/ls2080a_emu_defconfig| 1 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig| 1 + configs/ls2080aqds_qspi_defconfig| 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig| 1 + drivers/net/fsl-mc/mc.c | 24 +-- include/configs/ls2080ardb.h | 25 +++- lib/efi_loader/efi_boottime.c| 2 ++ lib/efi_loader/efi_memory.c | 15 +++ 21 files changed, 152 insertions(+), 18 deletions(-) -- 1.8.5.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5 3/7] ls2080ardb: Reserve DP-DDR RAM
The DP-DDR shouldn't be exposed as conventional memory to an OS, so let's rather claim it's a reserved region in the EFI memory map Signed-off-by: Alexander Graf--- board/freescale/ls2080ardb/ls2080ardb.c | 9 + 1 file changed, 9 insertions(+) diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index fab44b9..55199ca 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -201,6 +202,14 @@ int misc_init_r(void) if (adjust_vdd(0)) printf("Warning: Adjusting core voltage failed.\n"); +#ifdef CONFIG_EFI_LOADER + if (soc_has_dp_ddr() && gd->bd->bi_dram[2].size) { + efi_add_memory_map(gd->bd->bi_dram[2].start, + gd->bd->bi_dram[2].size >> EFI_PAGE_SHIFT, + EFI_RESERVED_MEMORY_TYPE, false); + } +#endif + return 0; } -- 1.8.5.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot