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 4a9ece206c304a7dd8d05797102f333a7ccb5777 Mon Sep 17 00:00:00 2001
|
2016-07-01 10:00:13 +02:00
|
|
|
From: Alexander Graf <agraf@suse.de>
|
|
|
|
|
Date: Mon, 2 May 2016 23:25:07 +0200
|
|
|
|
|
Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1""
|
|
|
|
|
|
|
|
|
|
This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685.
|
|
|
|
|
---
|
2017-02-14 00:42:17 +01:00
|
|
|
arch/arm/mach-omap2/boot-common.c | 2 --
|
2016-07-01 10:00:13 +02:00
|
|
|
1 file changed, 2 deletions(-)
|
|
|
|
|
|
2017-02-14 00:42:17 +01:00
|
|
|
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
|
2019-10-09 09:41:11 +02:00
|
|
|
index 734fa9d9e6..a35451f195 100644
|
2017-02-14 00:42:17 +01:00
|
|
|
--- a/arch/arm/mach-omap2/boot-common.c
|
|
|
|
|
+++ b/arch/arm/mach-omap2/boot-common.c
|
2019-10-09 09:41:11 +02:00
|
|
|
@@ -132,8 +132,6 @@ void save_omap_boot_params(void)
|
2016-07-01 10:00:13 +02:00
|
|
|
(boot_device <= MMC_BOOT_DEVICES_END)) {
|
|
|
|
|
switch (boot_device) {
|
|
|
|
|
case BOOT_DEVICE_MMC1:
|
|
|
|
|
- boot_mode = MMCSD_MODE_FS;
|
|
|
|
|
- break;
|
|
|
|
|
case BOOT_DEVICE_MMC2:
|
|
|
|
|
boot_mode = MMCSD_MODE_RAW;
|
|
|
|
|
break;
|
