Accepting request 795564 from hardware:boot:staging
- Drop downstream zynqmp generic patches since zynqmp virt config
superseed it:
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04
* Patches dropped:
0005-zynqmp-Add-generic-target.patch
0006-tools-zynqmpbif-Add-support-for-loa.patch
0007-boo-1123170-Remove-ubifs-support-fr.patch
0008-zynqmp-generic-fix-compilation.patch
0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
0010-Kconfig-add-btrfs-to-distro-boot.patch
0011-configs-Re-sync-with-CONFIG_DISTRO_.patch
0012-configs-am335x_evm-disable-BTRFS.patch
0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
* Patches added:
0005-tools-zynqmpbif-Add-support-for-loa.patch
0006-boo-1123170-Remove-ubifs-support-fr.patch
0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch
0008-Kconfig-add-btrfs-to-distro-boot.patch
0009-configs-Re-sync-with-CONFIG_DISTRO_.patch
0010-configs-am335x_evm-disable-BTRFS.patch
0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
- Follow upstream commits f7c6ee7f and be1b6c32 to unify
zynq/zynqmp configs:
* Update zynq configs to use generic config + device tree for
u-boot-avnetultra96rev1 and u-boot-xilinxzynqmpzcu102rev10
* Use upstream u-boot-xilinxzynqmpvirt instead of downstream
u-boot-xilinxzynqmpgeneric
- Switch to http URLs, ftp is obsolete
- Update to v2020.04:
* Platfrom fixes: Amlogic, Atmel, fsl, iMX, Marvell, Mediatek,
rockchip, RPi, samsung, socfpga, sunxi, Tegra, TI
* EFI fixes
* I2C fixes
* GPIO fixes
* MMC fixes
* SPI fixes
* USB fixes
* Filesystem fixes
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04
* Patches dropped:
0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch
0011-net-Add-support-for-Broadcom-GENETv.patch
0012-rpi4-Update-memory-map-to-accommoda.patch
0013-rpi4-Enable-GENET-Ethernet-controll.patch
0014-Kconfig-add-btrfs-to-distro-boot.patch
0015-configs-Re-sync-with-CONFIG_DISTRO_.patch
0016-configs-am335x_evm-disable-BTRFS.patch
0017-net-phy-Fix-overlong-PHY-timeout.patch
0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0020-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
* Patches added:
0010-Kconfig-add-btrfs-to-distro-boot.patch
0011-configs-Re-sync-with-CONFIG_DISTRO_.patch
0012-configs-am335x_evm-disable-BTRFS.patch
0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
OBS-URL: https://build.opensuse.org/request/show/795564
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
|
|
|
From 349eb7b2fb80724040951accfa440fe61b71bff8 Mon Sep 17 00:00:00 2001
|
2020-01-28 10:38:57 +01:00
|
|
|
From: Guillaume Gardet <guillaume.gardet@arm.com>
|
|
|
|
|
Date: Mon, 16 Dec 2019 17:51:17 +0100
|
2019-12-05 15:52:47 +01:00
|
|
|
Subject: [PATCH] boo#1144161: Remove nand/mtd/spi/dfu/fastboot support from
|
|
|
|
|
am335x_evm to keep a small u-boot.img
|
|
|
|
|
|
|
|
|
|
---
|
2020-01-28 10:38:57 +01:00
|
|
|
configs/am335x_evm_defconfig | 23 ++---------------------
|
|
|
|
|
1 file changed, 2 insertions(+), 21 deletions(-)
|
2019-12-05 15:52:47 +01:00
|
|
|
|
|
|
|
|
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
|
2020-01-28 10:38:57 +01:00
|
|
|
index 335aa8cfa1..ccb11c9b2a 100644
|
2019-12-05 15:52:47 +01:00
|
|
|
--- a/configs/am335x_evm_defconfig
|
|
|
|
|
+++ b/configs/am335x_evm_defconfig
|
2020-01-28 10:38:57 +01:00
|
|
|
@@ -15,21 +15,16 @@ CONFIG_ARCH_MISC_INIT=y
|
2019-12-05 15:52:47 +01:00
|
|
|
CONFIG_SPL_FIT_IMAGE_TINY=y
|
|
|
|
|
CONFIG_SPL_ETH_SUPPORT=y
|
|
|
|
|
# CONFIG_SPL_FS_EXT4 is not set
|
|
|
|
|
-CONFIG_SPL_MTD_SUPPORT=y
|
|
|
|
|
CONFIG_SPL_MUSB_NEW_SUPPORT=y
|
|
|
|
|
+# CONFIG_SPL_NAND_SUPPORT is not set
|
|
|
|
|
CONFIG_SPL_NET_SUPPORT=y
|
|
|
|
|
CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
|
|
|
|
|
CONFIG_SPL_OS_BOOT=y
|
|
|
|
|
CONFIG_SPL_USB_GADGET=y
|
|
|
|
|
CONFIG_SPL_USB_ETHER=y
|
|
|
|
|
CONFIG_CMD_SPL=y
|
|
|
|
|
-CONFIG_CMD_SPL_NAND_OFS=0x00080000
|
2020-01-28 10:38:57 +01:00
|
|
|
-# CONFIG_CMD_FLASH is not set
|
2019-12-05 15:52:47 +01:00
|
|
|
-CONFIG_CMD_NAND=y
|
2020-01-28 10:38:57 +01:00
|
|
|
+# CONFIG_CMD_DM is not set
|
2019-12-05 15:52:47 +01:00
|
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
|
|
|
-CONFIG_CMD_MTDPARTS=y
|
|
|
|
|
-CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
|
|
|
|
|
-CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
|
|
|
|
|
# CONFIG_SPL_EFI_PARTITION is not set
|
|
|
|
|
CONFIG_OF_CONTROL=y
|
|
|
|
|
CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
|
2020-01-28 10:38:57 +01:00
|
|
|
@@ -40,32 +35,19 @@ CONFIG_SPL_ENV_IS_NOWHERE=y
|
2019-12-05 15:52:47 +01:00
|
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
2020-01-28 10:38:57 +01:00
|
|
|
CONFIG_CLK=y
|
|
|
|
|
CONFIG_CLK_CDCE9XX=y
|
2019-12-05 15:52:47 +01:00
|
|
|
-CONFIG_DFU_MMC=y
|
|
|
|
|
-CONFIG_DFU_NAND=y
|
|
|
|
|
-CONFIG_DFU_RAM=y
|
|
|
|
|
-CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
|
|
|
CONFIG_DM_I2C=y
|
|
|
|
|
CONFIG_MISC=y
|
|
|
|
|
CONFIG_DM_MMC=y
|
|
|
|
|
# CONFIG_MMC_HW_PARTITIONING is not set
|
|
|
|
|
CONFIG_MMC_OMAP_HS=y
|
2020-01-28 10:38:57 +01:00
|
|
|
-CONFIG_MTD=y
|
|
|
|
|
-CONFIG_MTD_RAW_NAND=y
|
2019-12-05 15:52:47 +01:00
|
|
|
-CONFIG_DM_SPI_FLASH=y
|
|
|
|
|
-CONFIG_SF_DEFAULT_SPEED=24000000
|
|
|
|
|
-CONFIG_SPI_FLASH_WINBOND=y
|
|
|
|
|
CONFIG_DM_ETH=y
|
|
|
|
|
CONFIG_MII=y
|
|
|
|
|
CONFIG_DRIVER_TI_CPSW=y
|
|
|
|
|
-CONFIG_SPI=y
|
|
|
|
|
-CONFIG_DM_SPI=y
|
|
|
|
|
-CONFIG_OMAP3_SPI=y
|
|
|
|
|
CONFIG_TIMER=y
|
|
|
|
|
CONFIG_OMAP_TIMER=y
|
|
|
|
|
CONFIG_USB=y
|
|
|
|
|
CONFIG_DM_USB=y
|
|
|
|
|
CONFIG_DM_USB_GADGET=y
|
|
|
|
|
-CONFIG_SPL_DM_USB_GADGET=y
|
|
|
|
|
CONFIG_USB_MUSB_HOST=y
|
|
|
|
|
CONFIG_USB_MUSB_GADGET=y
|
|
|
|
|
CONFIG_USB_MUSB_TI=y
|
2020-01-28 10:38:57 +01:00
|
|
|
@@ -73,7 +55,6 @@ CONFIG_USB_GADGET=y
|
2019-12-05 15:52:47 +01:00
|
|
|
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
|
|
|
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
|
|
|
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
|
|
|
|
|
-CONFIG_USB_ETHER=y
|
|
|
|
|
CONFIG_WDT=y
|
|
|
|
|
# CONFIG_SPL_WDT is not set
|
|
|
|
|
CONFIG_DYNAMIC_CRC_TABLE=y
|
