January 2020 - U-Boot

[PATCH] zynqmp: configs: Remove SPI_FLASH_BAR from defconfig
by Michal Simek 07 Jan '20

07 Jan '20

From: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Remove SPI_FLASH_BAR for zynqmp mini platform. As it uses 4 byte addressing we dont need this config anymore. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index c6e03cd256d4..4780ec583569 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -53,7 +53,6 @@ CONFIG_SPL_DM=y # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_SPL_DM_SEQ_ALIAS=y # CONFIG_MMC is not set -CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y -- 2.24.0

1 0

Re: [U-Boot] [PATCH v5 1/5] spl: dm: disable SPI DM flash for non-DM SPL
by Lukasz Majewski 07 Jan '20

07 Jan '20

Hi Xiaowei, > Hi Lukasz, > > My patches depends on your patches > https://patchwork.ozlabs.org/project/uboot/list/?series=129069, do > you have plan to update it? I saw that the status is "changes > required", any comments? There was some discussion regarding this work with Frieder (CC'ed), who has prepared similar patch set. Some portions of this series: spi: Split CONFIG_DM_SPI* to CONFIG_{SPL_TPL}DM_SPI* has been applied. However, I don't know if Frieder is going (or already has) to prepare new version of this patch set. > > Thanks > Xiaowei > > > -----Original Message----- > > From: Xiaowei Bao > > Sent: 2019年10月21日 11:51 > > To: Lukasz Majewski <lukma(a)denx.de> > > Cc: wd(a)denx.de; Ruchika Gupta <ruchika.gupta(a)nxp.com>; Shengzhou Liu > > <shengzhou.liu(a)nxp.com>; jagan(a)amarulasolutions.com; Prabhakar X > > <prabhakar.kushwaha(a)nxp.com>; u-boot(a)lists.denx.de; Jiafei Pan > > <jiafei.pan(a)nxp.com>; Peng Ma <peng.ma(a)nxp.com> > > Subject: RE: [U-Boot] [PATCH v5 1/5] spl: dm: disable SPI DM flash > > for non-DM SPL > > > > Hi Lukasz, > > > > My patches depends on your patches > > https://patchwork.ozlabs.org/project/uboot/list/?series=129069, do > > you have plan to update it? I saw that the status is "changes > > required", any comments? > > > > Thanks > > Xiaowei > > > > > -----Original Message----- > > > From: Lukasz Majewski <lukma(a)denx.de> > > > Sent: 2019年8月23日 4:48 > > > To: Xiaowei Bao <xiaowei.bao(a)nxp.com> > > > Cc: wd(a)denx.de; Ruchika Gupta <ruchika.gupta(a)nxp.com>; Shengzhou > > > Liu <shengzhou.liu(a)nxp.com>; jagan(a)amarulasolutions.com; Prabhakar > > > Kushwaha <prabhakar.kushwaha(a)nxp.com>; u-boot(a)lists.denx.de; > > > Jiafei Pan <jiafei.pan(a)nxp.com>; Chuanhua Han > > > <chuanhua.han(a)nxp.com> Subject: Re: [U-Boot] [PATCH v5 1/5] spl: > > > dm: disable SPI DM flash for non-DM SPL > > > > > > On Thu, 22 Aug 2019 01:56:48 +0000 > > > Xiaowei Bao <xiaowei.bao(a)nxp.com> wrote: > > > > > > > > -----Original Message----- > > > > > From: Lukasz Majewski <lukma(a)denx.de> > > > > > Sent: 2019年8月20日 17:50 > > > > > To: Xiaowei Bao <xiaowei.bao(a)nxp.com> > > > > > Cc: wd(a)denx.de; Ruchika Gupta <ruchika.gupta(a)nxp.com>; > > > > > Shengzhou > > > Liu > > > > > <shengzhou.liu(a)nxp.com>; jagan(a)amarulasolutions.com; Prabhakar > > > > > Kushwaha <prabhakar.kushwaha(a)nxp.com>; u-boot(a)lists.denx.de; > > > > > Jiafei Pan <jiafei.pan(a)nxp.com>; Chuanhua Han > > > > > <chuanhua.han(a)nxp.com> > > > > > Subject: Re: [U-Boot] [PATCH v5 1/5] spl: dm: disable SPI DM > > > > > flash for non-DM SPL > > > > > > > > > > On Tue, 20 Aug 2019 09:00:40 +0000 Xiaowei Bao > > > > > <xiaowei.bao(a)nxp.com> wrote: > > > > > > > > > > > > -----Original Message----- > > > > > > > From: Lukasz Majewski <lukma(a)denx.de> > > > > > > > Sent: 2019年8月20日 16:20 > > > > > > > To: Xiaowei Bao <xiaowei.bao(a)nxp.com> > > > > > > > Cc: wd(a)denx.de; Ruchika Gupta <ruchika.gupta(a)nxp.com>; > > > Shengzhou > > > > > Liu > > > > > > > <shengzhou.liu(a)nxp.com>; jagan(a)amarulasolutions.com; > > Prabhakar > > > > > > > Kushwaha <prabhakar.kushwaha(a)nxp.com>; > > > > > > > u-boot(a)lists.denx.de; Jiafei Pan <jiafei.pan(a)nxp.com>; > > > > > > > Chuanhua Han <chuanhua.han(a)nxp.com> Subject: Re: [U-Boot] > > > > > > > [PATCH v5 1/5] spl: dm: disable SPI DM flash for non-DM > > > > > > > SPL > > > > > > > > > > > > > > On Tue, 20 Aug 2019 07:51:18 +0000 Xiaowei Bao > > > > > > > <xiaowei.bao(a)nxp.com> wrote: > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > From: Lukasz Majewski <lukma(a)denx.de> > > > > > > > > > Sent: 2019年8月20日 15:43 > > > > > > > > > To: Xiaowei Bao <xiaowei.bao(a)nxp.com> > > > > > > > > > Cc: wd(a)denx.de; Ruchika Gupta > > > > > > > > > <ruchika.gupta(a)nxp.com>; > > > > > Shengzhou > > > > > > > Liu > > > > > > > > > <shengzhou.liu(a)nxp.com>; jagan(a)amarulasolutions.com; > > > > > > > > > Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com>; > > > > > > > > > u-boot(a)lists.denx.de; Jiafei Pan > > > > > > > > > <jiafei.pan(a)nxp.com>; Pan Jiafei > > > > > > > > > <Jiafei.Pan(a)freescale.com>; Chuanhua Han > > > > > <chuanhua.han(a)nxp.com> > > > > > > > > > Subject: Re: [U-Boot] [PATCH v5 1/5] spl: dm: disable > > > > > > > > > SPI DM flash for non-DM SPL > > > > > > > > > > > > > > > > > > On Tue, 20 Aug 2019 07:27:39 +0000 Xiaowei Bao > > > > > > > > > <xiaowei.bao(a)nxp.com> wrote: > > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > > From: Lukasz Majewski <lukma(a)denx.de> > > > > > > > > > > > Sent: 2019年8月20日 15:14 > > > > > > > > > > > To: Xiaowei Bao <xiaowei.bao(a)nxp.com> > > > > > > > > > > > Cc: wd(a)denx.de; Ruchika Gupta > > > > > > > > > > > <ruchika.gupta(a)nxp.com>; > > > > > > > Shengzhou > > > > > > > > > Liu > > > > > > > > > > > <shengzhou.liu(a)nxp.com>; > > > > > > > > > > > jagan(a)amarulasolutions.com; Prabhakar Kushwaha > > > > > > > > > > > <prabhakar.kushwaha(a)nxp.com>; > > > > > > > > > > > u-boot(a)lists.denx.de; Jiafei Pan > > > > > > > > > > > <jiafei.pan(a)nxp.com>; Pan Jiafei > > > > > > > > > > > <Jiafei.Pan(a)freescale.com>; Chuanhua Han > > > > > > > <chuanhua.han(a)nxp.com> > > > > > > > > > > > Subject: Re: [U-Boot] [PATCH v5 1/5] spl: dm: > > > > > > > > > > > disable SPI DM flash for non-DM SPL > > > > > > > > > > > > > > > > > > > > > > Hi Xiaowei, > > > > > > > > > > > > > > > > > > > > > > > From: Chuanhua Han <chuanhua.han(a)nxp.com> > > > > > > > > > > > > > > > > > > > > > > > > This patch solves the problem that spiboot > > > > > > > > > > > > cannot be performed in non-DM SPL. > > > > > > > > > > > > > > > > > > > > > > I've posted recently a set of patches to move > > > > > > > > > > > setting of DM_SPI_FLASH to Kconfig: > > > > > > > > > > > https://patchwork.ozlabs.org/cover/1146494/ > > > > > > > > > > > > > > > > > > > > > > Please rebase your work on top of it. > > > > > > > > > > Did this set of patches merge to the u-boot > > > > > > > > > > mainline? > > > > > > > > > > > > > > > > > > Those patches were not yet accepted to mainline. > > > > > > > > > > > > > > > > > > > Do I need to > > > > > > > > > > depend on your patches? > > > > > > > > > > > > > > > > > > It would be best to avoid duplicating the effort. > > > > > > > > > > > > > > > > > > > If yes, please provide the full patches link, I > > > > > > > > > > can't see the contents of this set of patches. > > > > > > > > > > > > > > > > > > When you open the link: > > > > > > > > > https://patchwork.ozlabs.org/cover/1146494/ > > > > > > > > > > > > > > > > > > On top left you have: > > > > > > > > > "Related" -> "show" > > > > > > > > > > > > > > > > > > After clicking on it you will see the list of patches. > > > > > > > > > > > > > > > > > > You may also want to use "Series" on top right and > > > > > > > > > download the whole patch series. > > > > > > > > I have check these set of patches, it don't impact my > > > > > > > > patches, my patches implemented the ESPI DM driver of > > POWERPC. > > > > > > > > > > > > > > But you add: > > > > > > > > > > > > > > +#undef CONFIG_DM_SPI_FLASH > > > > > > > > > > > > > > for SPL, Which is problematic as explained in the patch > > > > > > > set. > > > > > > Can I modify the patches like this? > > > > > > diff --git a/include/config_uncmd_spl.h > > > > > > b/include/config_uncmd_spl.h index da94b3d..c2f9735 100644 > > > > > > --- a/include/config_uncmd_spl.h > > > > > > +++ b/include/config_uncmd_spl.h > > > > > > @@ -15,7 +15,6 @@ > > > > > > #undef CONFIG_DM_GPIO > > > > > > #undef CONFIG_DM_I2C > > > > > > #undef CONFIG_DM_SPI > > > > > > -#undef CONFIG_DM_SPI_FLASH > > > > > > #endif > > > > > > > > > > > > #undef CONFIG_DM_WARN > > > > > > diff --git a/include/configs/T208xQDS.h > > > > > > b/include/configs/T208xQDS.h index 98bb334..b45ec4a 100644 > > > > > > --- a/include/configs/T208xQDS.h > > > > > > +++ b/include/configs/T208xQDS.h > > > > > > @@ -10,6 +10,13 @@ > > > > > > #ifndef __T208xQDS_H > > > > > > #define __T208xQDS_H > > > > > > > > > > > > +/* SPI Flash Configs */ > > > > > > +#if defined(CONFIG_SPL_BUILD) > > > > > > +#undef CONFIG_DM_SPI > > > > > > +#undef CONFIG_DM_SPI_FLASH > > > > > > +#undef CONFIG_SPI_FLASH_MTD > > > > > > +#endif > > > > > > > > > > The whole point is to avoid adding the above code. > > > > > > > > > > The rationale for this can be found in the commit message: > > > > > https://patchwork.ozlabs.org/patch/1146375/ > > > > Hi Lukasz, thanks for your comments, ask a question, I modify my > > > > driver like this: diff --git a/drivers/spi/fsl_espi.c > > > > b/drivers/spi/fsl_espi.c index fd5ac97..54be036 100644 > > > > --- a/drivers/spi/fsl_espi.c > > > > +++ b/drivers/spi/fsl_espi.c > > > > @@ -367,6 +367,7 @@ void espi_setup_slave(struct fsl_spi_slave > > > > *fsl) > > > > * 10), spi_freq);/* Set eSPI > > > > BRG > > > clock > > > > source */ } > > > > > > > > #ifndef CONFIG_DM_SPI > > > > +#if !CONFIG_IS_ENABLED(DM_SPI) > > > > int spi_cs_is_valid(unsigned int bus, unsigned int cs) { > > > > > > > > diff --git a/configs/T2080QDS_SPIFLASH_defconfig > > > > b/configs/T2080QDS_SPIFLASH_defconfig index 7a1c580..cf53e54 > > > > 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig > > > > +++ b/configs/T2080QDS_SPIFLASH_defconfig > > > > @@ -80,3 +80,5 @@ CONFIG_DM_SPI=y > > > > CONFIG_DM_SPI_FLASH=y > > > > +CONFIG_SPL_DM_SPI=y > > > > +CONFIG_SPL_DM_SPI_FLASH=y > > > > > > > > When I compile the driver with SPL mode, the DM or non DM mode > > > > cod will be compiled together, I think > > > > CONFIG_IS_ENABLED(DM_SPI) is 0 or 1, so the DM code or non DM > > > > code will be compiled, but not both, this make me confused, do > > > > I miss something, could you tell me the reason? Thanks a lot. > > > > > > So the CONFIG_IS_ENABLED(FOO) is true if: > > > > > > 1. The CONFIG_FOO is defined in Kconfig files (if it is defined in > > > ./include/configs/<board.h> then CONFIG_IS_ENABLED will return > > > false, which is wrong). > > > > > > 2. The CONFIG_IS_ENABLED(FOO) is true if in Kconfig you have > > > defined CONFIG_FOO > > > > > > 3. CONFIG_IS_ENABLED(FOO) is true if in Kconfig you have defined > > > CONFIG_SPL_FOO > > > > > > So the CONFIG_IS_ENABLED(FOO) shall be used in conjunction with > > > CONFIG_DM_FOO (SPI in your case). > > > > > > > > > > > > > > > > > > > > > + > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Pan Jiafei > > > > > > > > > > > > <Jiafei.Pan(a)freescale.com> Signed-off-by: > > > > > > > > > > > > Chuanhua Han <chuanhua.han(a)nxp.com> --- > > > > > > > > > > > > Changes in v5: > > > > > > > > > > > > - No change. > > > > > > > > > > > > Changes in v4: > > > > > > > > > > > > - No change. > > > > > > > > > > > > Changes in v3: > > > > > > > > > > > > - Add a cover-letter for this patch set. > > > > > > > > > > > > Changes in v2: > > > > > > > > > > > > - No change. > > > > > > > > > > > > > > > > > > > > > > > > include/config_uncmd_spl.h | 1 + > > > > > > > > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > > > > > > > > > > > > > > > diff --git a/include/config_uncmd_spl.h > > > > > > > > > > > > b/include/config_uncmd_spl.h index > > > > > > > > > > > > c2f9735..da94b3d 100644 --- > > > > > > > > > > > > a/include/config_uncmd_spl.h +++ > > > > > > > > > > > > b/include/config_uncmd_spl.h @@ -15,6 +15,7 @@ > > > > > > > > > > > > #undef CONFIG_DM_GPIO #undef CONFIG_DM_I2C > > > #undef > > > > > > > > > > > > CONFIG_DM_SPI > > > > > > > > > > > > +#undef CONFIG_DM_SPI_FLASH > > > > > > > > > > > > #endif > > > > > > > > > > > > > > > > > > > > > > > > #undef CONFIG_DM_WARN > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Best regards, > > > > > > > > > > > > > > > > > > > > > > Lukasz Majewski > > > > > > > > > > > > > > > > > > > > > > -- > > > > > > > > > > > > > > > > > > > > > > DENX Software Engineering GmbH, Managing > > > > > > > > > > > Director: > > > > > > > Wolfgang > > > > > > > > > > > Denk HRB 165235 Munich, Office: Kirchenstr.5, > > > > > > > > > > > D-82194 Groebenzell, Germany Phone: > > > > > > > > > > > (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 > > > > > > > > > > > Email: lukma(a)denx.de > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Best regards, > > > > > > > > > > > > > > > > > > Lukasz Majewski > > > > > > > > > > > > > > > > > > -- > > > > > > > > > > > > > > > > > > DENX Software Engineering GmbH, Managing > > > > > > > > > Director: > > > > > Wolfgang > > > > > > > > > Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 > > > > > > > > > Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: > > > > > > > > > (+49)-8142-66989-80 Email: lukma(a)denx.de > > > > > > > > > > > > > > > > > > > > > > > > > > > > Best regards, > > > > > > > > > > > > > > Lukasz Majewski > > > > > > > > > > > > > > -- > > > > > > > > > > > > > > DENX Software Engineering GmbH, Managing Director: > > > Wolfgang > > > > > > > Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 > > > > > > > Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: > > > > > > > (+49)-8142-66989-80 Email: lukma(a)denx.de > > > > > > > > > > > > > > > > > > > > Best regards, > > > > > > > > > > Lukasz Majewski > > > > > > > > > > -- > > > > > > > > > > DENX Software Engineering GmbH, Managing Director: > > > > > Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, > > > > > D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: > > > > > (+49)-8142-66989-80 Email: lukma(a)denx.de > > > > > > > > > > > > Best regards, > > > > > > Lukasz Majewski > > > > > > -- > > > > > > DENX Software Engineering GmbH, Managing Director: Wolfgang > > Denk > > > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, > > > Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > > > lukma(a)denx.de Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma(a)denx.de

3 4

[PATCH 0/2] amlogic: add Khadas VIM3L support
by Christian Hewitt 07 Jan '20

07 Jan '20

Khadas VIM3L is a new revision of the VIM3 board that swaps the premium A311D chip for Amlogic's mid-range S905D3 chip. Christian Hewitt (2): ARM: dts: Import Khadas VIM3L DT from Linux 5.5-rc1 boards: amlogic: add Khadas VIM3L support arch/arm/dts/Makefile | 1 + arch/arm/dts/meson-sm1-khadas-vim3l.dts | 95 +++++++++++++++++++++++ board/amlogic/w400/README.khadas-vim3l | 132 ++++++++++++++++++++++++++++++++ configs/khadas-vim3l_defconfig | 62 +++++++++++++++ 4 files changed, 290 insertions(+) create mode 100644 arch/arm/dts/meson-sm1-khadas-vim3l.dts create mode 100644 board/amlogic/w400/README.khadas-vim3l create mode 100644 configs/khadas-vim3l_defconfig -- 2.7.4

3 5

[U-Boot] [PATCH 01/30] lib: Allow crc32 to be disabled.
by Simon Glass 07 Jan '20

07 Jan '20

Unfortunately this table seems to appear in TPL with gcc 7.3 even if it is not used. Fix it by creating a Kconfig that can be used to disable this routine. It is enabled by default, since most boards use it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- lib/Kconfig | 29 +++++++++++++++++++++++++++++ lib/Makefile | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index 135f0b372b..be5f9d343a 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -353,6 +353,35 @@ config SHA_PROG_HW_ACCEL config MD5 bool +config CRC32 + bool "Enable crc32 routine" + default y + help + This enables a 32-bit CRC (cyclic-redundancy check) routine. It is + typically used to check for changes in a group of bytes. Even a + small change typically produces a very different CRC value. This + algorithm is simple and quite fast. + +config SPL_CRC32 + bool "Enable crc32 routine in SPL" + depends on SPL + default y + help + This enables a 32-bit CRC (cyclic-redundancy check) routine in SPL. It + is typically used to check for changes in a group of bytes. Even a + small change typically produces a very different CRC value. This + algorithm is simple and quite fast. + +config TPL_CRC32 + bool "Enable crc32 routine in SPL" + depends on TPL + default y + help + This enables a 32-bit CRC (cyclic-redundancy check) routine in SPL. It + is typically used to check for changes in a group of bytes. Even a + small change typically produces a very different CRC value. This + algorithm is simple and quite fast. + config CRC32C bool diff --git a/lib/Makefile b/lib/Makefile index d248d8626c..8adc08fd73 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -84,7 +84,7 @@ obj-y += errno.o obj-y += display_options.o CFLAGS_display_options.o := $(if $(BUILD_TAG),-DBUILD_TAG='"$(BUILD_TAG)"') obj-$(CONFIG_BCH) += bch.o -obj-y += crc32.o +obj-$(CONFIG_$(SPL_TPL_)CRC32) += crc32.o obj-$(CONFIG_CRC32C) += crc32c.o obj-y += ctype.o obj-y += div64.o -- 2.24.0.rc0.303.g954a862665-goog

8 40

[PATCH] uniphier_{v7, v8}_defconfig: enable SPI driver and sspi command
by Masahiro Yamada 07 Jan '20

07 Jan '20

Compile drivers/spi/uniphier_spi.c and cmd/spi.c Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/Kconfig | 1 + configs/uniphier_v7_defconfig | 3 +++ configs/uniphier_v8_defconfig | 3 +++ 3 files changed, 7 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f9dab073ea14..e9a4e6c25fb5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1515,6 +1515,7 @@ config ARCH_UNIPHIER select DM_MMC select DM_RESET select DM_SERIAL + select DM_SPI select DM_USB select OF_BOARD_SETUP select OF_CONTROL diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 112234df9fa1..283d9111fe53 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_CACHE=y @@ -52,6 +53,8 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y CONFIG_DM_ETH=y CONFIG_SNI_AVE=y +CONFIG_SPI=y +CONFIG_UNIPHIER_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index 5acb1437bcfb..7021dbed1e72 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_CACHE=y @@ -53,6 +54,8 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_DM_ETH=y CONFIG_SNI_AVE=y CONFIG_PINCONF=y +CONFIG_SPI=y +CONFIG_UNIPHIER_SPI=y CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_USB=y -- 2.17.1

1 0

[PATCH v3 0/5] rk3399: Add redundant boot support
by Jagan Teki 07 Jan '20

07 Jan '20

Boot redundancy is one of the key criteria for switch recovery or golden partition based on the bootcount value, which indeed very much needed in production systems on the fields. This is v3 patchset support redundant boot on Rockchip rk3399. This series skip wdt changes as Marek patches support the same. Changes for v3: - rework of cru.h to include rk3288 - rebase on master Changes for v2: - Handle TPL build for watchdog, if TPL won't enable - Fix comments for dw_wdt driver-model comments from Andy - Add Kconfig items for WDT_TPL - Support WDT on TPL as well - Use SYS_SOC for cpu-info Any inputs? Jagan. Jagan Teki (5): rockchip: Add cpu-info rockchip: rk3399: Enable DISPLAY_CPUINFO arm: rockchip: Add common cru.h rockchip: Add common reset cause rockchip: rk3399: Add bootcount support arch/arm/include/asm/arch-rockchip/clock.h | 4 +- arch/arm/include/asm/arch-rockchip/cru.h | 28 ++++++++ .../include/asm/arch-rockchip/cru_rk3288.h | 20 ++---- .../include/asm/arch-rockchip/cru_rk3399.h | 10 +-- arch/arm/mach-rockchip/Kconfig | 2 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/cpu-info.c | 65 +++++++++++++++++++ arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/rk3288.c | 41 +----------- arch/arm/mach-rockchip/rk3399/Kconfig | 10 +++ arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- configs/evb-rk3288_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/ficus-rk3399_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/leez-rk3399_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/nanopc-t4-rk3399_defconfig | 1 - configs/nanopi-m4-rk3399_defconfig | 1 - configs/nanopi-neo4-rk3399_defconfig | 1 - configs/orangepi-rk3399_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/roc-pc-rk3399_defconfig | 1 - configs/rock-pi-4-rk3399_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/tinker-s-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/clk/rockchip/clk_rk3288.c | 42 ++++++------ drivers/clk/rockchip/clk_rk3399.c | 36 +++++----- drivers/ram/rockchip/sdram_rk3288.c | 10 +-- drivers/ram/rockchip/sdram_rk3399.c | 10 +-- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- include/configs/rk3399_common.h | 5 +- 44 files changed, 177 insertions(+), 143 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/cru.h create mode 100644 arch/arm/mach-rockchip/cpu-info.c -- 2.18.0.321.gffc6fa0e3

2 10

[PATCH] ARM: dts: uniphier: add pinmux nodes for I2C ch5, ch6
by Masahiro Yamada 07 Jan '20

07 Jan '20

The next generation SoC can connect on-board slave devices via I2C ch5 and ch6. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/dts/uniphier-pinctrl.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi index 1fee5ffbfb9c..bfdfb764b25b 100644 --- a/arch/arm/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/dts/uniphier-pinctrl.dtsi @@ -106,6 +106,16 @@ function = "i2c4"; }; + pinctrl_i2c5: i2c5 { + groups = "i2c5"; + function = "i2c5"; + }; + + pinctrl_i2c6: i2c6 { + groups = "i2c6"; + function = "i2c6"; + }; + pinctrl_nand: nand { groups = "nand"; function = "nand"; -- 2.17.1

1 0

[PATCH 1/1] efi_loader remove __packed from struct efi_configuration_table
by Heinrich Schuchardt 07 Jan '20

07 Jan '20

struct efi_configuration_table is naturally packed. There is no need for a __packed attribute. Hence remove it. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/efi_api.h b/include/efi_api.h index 22396172e1..a3ff140ac9 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -322,7 +322,7 @@ struct efi_runtime_services { struct efi_configuration_table { efi_guid_t guid; void *table; -} __packed; +}; #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL) -- 2.24.1

1 1

[PATCH v5 1/1] efi_loader: Add guidcpy function
by Heinrich Schuchardt 07 Jan '20

07 Jan '20

From: Sughosh Ganu <sughosh.ganu(a)linaro.org> Add guidcpy function to copy the source guid to the destination guid. Use this function instead of memcpy for copying to the destination guid. Signed-off-by: Sughosh Ganu <sughosh.ganu(a)linaro.org> Use void * instead of efi_guid_t * for arguments to allow copying unaligned GUIDs. The GUIDs of configuration tables are __packed. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v5: use void * as argument type --- include/efi_loader.h | 5 +++++ lib/efi_loader/efi_boottime.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 4d401f69d7..e1c9b1fd6a 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -17,6 +17,11 @@ static inline int guidcmp(const void *g1, const void *g2) return memcmp(g1, g2, sizeof(efi_guid_t)); } +static inline void *guidcpy(void *dst, const void *src) +{ + return memcpy(dst, src, sizeof(efi_guid_t)); +} + /* No need for efi loader support in SPL */ #if CONFIG_IS_ENABLED(EFI_LOADER) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 88a7604bbf..3103a50158 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1401,7 +1401,7 @@ static efi_status_t EFIAPI efi_register_protocol_notify( } item->event = event; - memcpy(&item->protocol, protocol, sizeof(efi_guid_t)); + guidcpy(&item->protocol, protocol); INIT_LIST_HEAD(&item->handles); list_add_tail(&item->link, &efi_register_notify_events); @@ -1632,7 +1632,7 @@ efi_status_t efi_install_configuration_table(const efi_guid_t *guid, return EFI_OUT_OF_RESOURCES; /* Add a new entry */ - memcpy(&systab.tables[i].guid, guid, sizeof(*guid)); + guidcpy(&systab.tables[i].guid, guid); systab.tables[i].table = table; systab.nr_tables = i + 1; -- 2.24.1

1 0

[PATCH 0/2] cmd: efidebug: new sub-command tables
by Heinrich Schuchardt 07 Jan '20

07 Jan '20

Provide sub-command for efidebug to list configuration tables. Adjust get_guid_text() to accept unaligned GUIDs of configuration tables. Heinrich Schuchardt (2): cmd: efidebug: simplify get_guid_text() cmd: efidebug: new sub-command tables cmd/efidebug.c | 72 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 12 deletions(-) -- 2.24.1

1 2