pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

u-boot_2018.09.bbappend: Rename SRC_URI_remove patch

Browse source 
A patch removed with SRC_URI_remove and re-worked was not
applying (no output error, the behavior is as it doesn't
exist), because the re-worked patch had the same name
as the removed one.

Remove 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch.
This patch exists in meta-sunxi and it applies over
versions of u-boot.2018.09

Changelog-entry: Rename re-worked patch to have it applied
Signed-off-by: Vicentiu Galanopulo <vicentiu@balena.io>
This commit is contained in:
Vicentiu Galanopulo 2019-10-28 14:54:55 +01:00
parent c6f31ae2ac
commit bd839185ed
3 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
layers/meta-balena-allwinner/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
View file

@ -1,26 +0,0 @@
From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001
From: Florin Sarbu <florin@resin.io>
Date: Wed, 12 Sep 2018 14:22:49 +0200
Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support
Upstream-status: Pending
Signed-off-by: Florin Sarbu <florin@resin.io>
---
configs/nanopi_neo_air_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
index ca9c2dd..74ce044 100644
--- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_CONSOLE_MUX=y
CONFIG_SPL=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
--
2.7.4

0
layers/meta-balena-allwinner/recipes-bsp/u-boot/files/resin-specific-env-integration-kconfig.patch → layers/meta-balena-allwinner/recipes-bsp/u-boot/files/resin-specific-env-integration-kconfig_reworked.patch
View file

22
layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2018.09.bbappend
View file

@ -1,17 +1,13 @@
UBOOT_KCONFIG_SUPPORT = "1"
inherit resin-u-boot
FILESEXTRAPATHS_append := ":${THISDIR}/files"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
# remove the resin-specific-env-integration-kconfig.patch patch from
# meta-sunxi because it fails to apply
SRC_URI_remove = "file://resin-specific-env-integration-kconfig.patch"
#remove the resin-specific-env-integration-kconfig.patch patch from meta-resin
#and the 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch patch from
#meta-sunxi because these fail to apply
SRC_URI_remove = "file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://resin-specific-env-integration-kconfig.patch"
#Add updated patches for 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
#and for 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
SRC_URI += "file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://0001-Add-Resin-specific-boot-command.patch \
file://resin-specific-env-integration-kconfig.patch \
"
# Add re-worked patch resin-specific-env-integration-kconfig_reworked.patch
SRC_URI_append = " \
file://0001-Add-Resin-specific-boot-command.patch \
file://resin-specific-env-integration-kconfig_reworked.patch \
"