u-boot/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch

24 lines
823 B
Diff
Raw Normal View History

Accepting request 607419 from hardware:boot:staging - Conditionalize pine64plus ATF support on uboot_atf_pine64 - u-boot-board.spec.in: Update license - Add poplar - Update to 2018.05 - Update to 2018.05-rc3 - Include u-boot.spec in autogeneration logic - Add support for .bif generation in mkimage - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0006-tools-zynqmpimage-Add-partition-rea.patch 0007-tools-zynqmpimage-Move-defines-to-h.patch 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch 0009-tools-zynqmpimage-Add-bif-support.patch 0010-tools-zynqmpbif-Add-support-for-loa.patch - Add generic ZynqMP support - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0005-zynqmp-Add-generic-target.patch - Update to 2018.05-rc2 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch 0010-Temp-workaround-for-Chromebook-snow.patch * Patches added: 0004-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0010-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0009-rpi-Allow-to-boot-without-serial.patch 0010-mmc-use-core-clock-frequency-in-bcm.patch * Patches added: 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch - Update to 2018.05-rc1 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0003-Revert-rockchip-mkimage-remove-plac.patch 0004-rpi-Use-firmware-provided-device-tr.patch 0005-rpi3-Enable-lan78xx-driver.patch 0006-net-Only-access-network-devices-aft.patch 0007-rpi-Add-identifier-for-the-new-RPi3.patch 0008-efi_loader-Fix-network-DP-with-DM_E.patch * Patches added: 0003-rpi-Use-firmware-provided-device-tr.patch 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch OBS-URL: https://build.opensuse.org/request/show/607419 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=16
2018-05-15 11:14:56 +02:00
From 4daf6d83c59033e5b9ac84d7b97b1093ed0aa852 Mon Sep 17 00:00:00 2001
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.
---
arch/arm/mach-omap2/boot-common.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
Accepting request 607419 from hardware:boot:staging - Conditionalize pine64plus ATF support on uboot_atf_pine64 - u-boot-board.spec.in: Update license - Add poplar - Update to 2018.05 - Update to 2018.05-rc3 - Include u-boot.spec in autogeneration logic - Add support for .bif generation in mkimage - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0006-tools-zynqmpimage-Add-partition-rea.patch 0007-tools-zynqmpimage-Move-defines-to-h.patch 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch 0009-tools-zynqmpimage-Add-bif-support.patch 0010-tools-zynqmpbif-Add-support-for-loa.patch - Add generic ZynqMP support - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0005-zynqmp-Add-generic-target.patch - Update to 2018.05-rc2 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch 0010-Temp-workaround-for-Chromebook-snow.patch * Patches added: 0004-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0010-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0009-rpi-Allow-to-boot-without-serial.patch 0010-mmc-use-core-clock-frequency-in-bcm.patch * Patches added: 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch - Update to 2018.05-rc1 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0003-Revert-rockchip-mkimage-remove-plac.patch 0004-rpi-Use-firmware-provided-device-tr.patch 0005-rpi3-Enable-lan78xx-driver.patch 0006-net-Only-access-network-devices-aft.patch 0007-rpi-Add-identifier-for-the-new-RPi3.patch 0008-efi_loader-Fix-network-DP-with-DM_E.patch * Patches added: 0003-rpi-Use-firmware-provided-device-tr.patch 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch OBS-URL: https://build.opensuse.org/request/show/607419 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=16
2018-05-15 11:14:56 +02:00
index 0e9fd03fef..7b1cdb2e68 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
Accepting request 607419 from hardware:boot:staging - Conditionalize pine64plus ATF support on uboot_atf_pine64 - u-boot-board.spec.in: Update license - Add poplar - Update to 2018.05 - Update to 2018.05-rc3 - Include u-boot.spec in autogeneration logic - Add support for .bif generation in mkimage - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0006-tools-zynqmpimage-Add-partition-rea.patch 0007-tools-zynqmpimage-Move-defines-to-h.patch 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch 0009-tools-zynqmpimage-Add-bif-support.patch 0010-tools-zynqmpbif-Add-support-for-loa.patch - Add generic ZynqMP support - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0005-zynqmp-Add-generic-target.patch - Update to 2018.05-rc2 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch 0010-Temp-workaround-for-Chromebook-snow.patch * Patches added: 0004-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0010-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0009-rpi-Allow-to-boot-without-serial.patch 0010-mmc-use-core-clock-frequency-in-bcm.patch * Patches added: 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch - Update to 2018.05-rc1 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0003-Revert-rockchip-mkimage-remove-plac.patch 0004-rpi-Use-firmware-provided-device-tr.patch 0005-rpi3-Enable-lan78xx-driver.patch 0006-net-Only-access-network-devices-aft.patch 0007-rpi-Add-identifier-for-the-new-RPi3.patch 0008-efi_loader-Fix-network-DP-with-DM_E.patch * Patches added: 0003-rpi-Use-firmware-provided-device-tr.patch 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch OBS-URL: https://build.opensuse.org/request/show/607419 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=16
2018-05-15 11:14:56 +02:00
@@ -133,8 +133,6 @@ void save_omap_boot_params(void)
(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;