From 3d30464041ef78b92751f6f89cfb8299dea6f62d Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 24 Jan 2022 17:25:01 -0600 Subject: Remove SAM9X5EK SPI flash from U-Boot to prevent GPIO conflicts --- recipes-bsp/u-boot/u-boot-2016.09.01/config.patch | 16 +++++++++++----- recipes-bsp/u-boot/u-boot.inc | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'recipes-bsp') diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/config.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/config.patch index 658fdec..51fcb1e 100644 --- a/recipes-bsp/u-boot/u-boot-2016.09.01/config.patch +++ b/recipes-bsp/u-boot/u-boot-2016.09.01/config.patch @@ -1,6 +1,10 @@ -diff -Naru old/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek_nandflash_defconfig ---- old/configs/at91sam9x5ek_nandflash_defconfig 2019-04-09 18:00:13.342337484 -0500 -+++ new/configs/at91sam9x5ek_nandflash_defconfig 2019-04-15 12:06:49.171618119 -0500 + CONFIG_CMD_SF brings in SPI flash baggage and sets up SPI for the Atmel + AT91SAM9X5EK board, which does not match our usage of pins in the pioA 7 + through pioA 20 region. +====================================================================================== +diff -Naru orig/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek_nandflash_defconfig +--- orig/configs/at91sam9x5ek_nandflash_defconfig 2022-01-24 16:08:01.151798695 -0600 ++++ new/configs/at91sam9x5ek_nandflash_defconfig 2022-01-24 16:24:37.851818785 -0600 @@ -1,9 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y @@ -13,11 +17,13 @@ diff -Naru old/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_BOOTZ=y -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y - CONFIG_CMD_SF=y +-CONFIG_CMD_SF=y -CONFIG_CMD_USB=y ++# CONFIG_CMD_SF=y is not set +CONFIG_CMD_USB=n # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 800c48e..c69c650 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -4,7 +4,7 @@ SECTION = "bootloaders" PROVIDES = "virtual/bootloader" # New U-Boot with suppressed version. -PR="m4" +PR="m5" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -- cgit v1.2.3