Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

reform-boundary-uboot
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

8ada17dd

Commit 8ada17dd authored 6 years ago by Tom Rini

Downloads
- Plain Diff

Merge branch 'master' of git://git.denx.de/u-boot-spi


- Fix a conflict in drivers/spi/atcspi200_spi.c related to the riscv
  tree fixing a warning.

Signed-off-by: Tom Rini <trini@konsulko.com>

parents 964d4f72 a2569f12

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/dts/stm32f746.dtsi 2 additions, 1 deletion

arch/arm/dts/stm32f746.dtsi
drivers/mtd/spi/spi_flash.c 6 additions, 5 deletions

drivers/mtd/spi/spi_flash.c
drivers/mtd/spi/spi_flash_ids.c 6 additions, 0 deletions

drivers/mtd/spi/spi_flash_ids.c
drivers/spi/atcspi200_spi.c 4 additions, 2 deletions

drivers/spi/atcspi200_spi.c
drivers/spi/fsl_qspi.c 1 addition, 1 deletion

drivers/spi/fsl_qspi.c
drivers/spi/lpc32xx_ssp.c 1 addition, 1 deletion

drivers/spi/lpc32xx_ssp.c
drivers/spi/stm32_qspi.c 60 additions, 31 deletions

drivers/spi/stm32_qspi.c

with 80 additions and 41 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment