forked from pool/u-boot
3f5ae570bf
- 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
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From be3112208a9246eb6f0bd15947154db0bef65d26 Mon Sep 17 00:00:00 2001
|
|
From: Guillaume GARDET <guillaume.gardet@free.fr>
|
|
Date: Tue, 29 Jan 2019 11:38:12 +0100
|
|
Subject: [PATCH] boo#1123170: Remove ubifs support from omap3_beagle to keep a
|
|
small u-boot.img
|
|
|
|
---
|
|
configs/omap3_beagle_defconfig | 2 +-
|
|
include/configs/omap3_beagle.h | 1 -
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
|
|
index ed7cb8f2ff..03dc3b27d4 100644
|
|
--- a/configs/omap3_beagle_defconfig
|
|
+++ b/configs/omap3_beagle_defconfig
|
|
@@ -38,7 +38,6 @@ CONFIG_CMD_FS_UUID=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)"
|
|
-CONFIG_CMD_UBI=y
|
|
# CONFIG_ISO_PARTITION is not set
|
|
# CONFIG_SPL_EFI_PARTITION is not set
|
|
CONFIG_SPL_PARTITION_UUIDS=y
|
|
@@ -73,6 +72,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
|
|
CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
|
|
CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
|
|
CONFIG_SPL_NAND_SIMPLE=y
|
|
+CONFIG_MTD_UBI=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_OMAP3_SPI=y
|
|
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
|
|
index bc8aa7adf5..ee1d36003e 100644
|
|
--- a/include/configs/omap3_beagle.h
|
|
+++ b/include/configs/omap3_beagle.h
|
|
@@ -82,7 +82,6 @@
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 0) \
|
|
func(LEGACY_MMC, legacy_mmc, 0) \
|
|
- func(UBIFS, ubifs, 0) \
|
|
func(NAND, nand, 0)
|
|
|
|
#else /* !CONFIG_MTD_RAW_NAND */
|