dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-12-26 04:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #266 from twoerner/contrib/twoerner/fixes-04

Browse Source 
Contrib/twoerner/fixes 04
This commit is contained in:
Marek Belisko 2019-09-02 07:52:42 +02:00 committed by GitHub
commit 23acf5bc61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
View File

@ -1,20 +1,21 @@
From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001 From 6adb2ebdc4022c24497e9ee4dccab41d18e3105d Mon Sep 17 00:00:00 2001
From: Florin Sarbu <florin@resin.io> From: Florin Sarbu <florin@resin.io>
Date: Wed, 12 Sep 2018 14:22:49 +0200 Date: Wed, 12 Sep 2018 14:22:49 +0200
Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support
Upstream-status: Pending Upstream-status: Pending
Signed-off-by: Florin Sarbu <florin@resin.io> Signed-off-by: Florin Sarbu <florin@resin.io>
--- ---
configs/nanopi_neo_air_defconfig | 1 + configs/nanopi_neo_air_defconfig | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
index 8c362fa885..c7929ff015 100644 index 5ad90ddd16..8b7a4eb45d 100644
--- a/configs/nanopi_neo_air_defconfig --- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig +++ b/configs/nanopi_neo_air_defconfig
@@ -15,3 +15,4 @@ CONFIG_CONSOLE_MUX=y @@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2

16
recipes-bsp/u-boot/u-boot_2018.09.bb → recipes-bsp/u-boot/u-boot_%.bbappend
View File

@ -1,13 +1,8 @@
DESCRIPTION="Upstream's U-boot configured for sunxi devices" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
require recipes-bsp/u-boot/u-boot.inc
DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native "
DEPENDS_append_sun50i = " atf-sunxi " DEPENDS_append_sun50i = " atf-sunxi "
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
DEFAULT_PREFERENCE_sun4i="1" DEFAULT_PREFERENCE_sun4i="1"
@ -16,18 +11,11 @@ DEFAULT_PREFERENCE_sun7i="1"
DEFAULT_PREFERENCE_sun8i="1" DEFAULT_PREFERENCE_sun8i="1"
DEFAULT_PREFERENCE_sun50i="1" DEFAULT_PREFERENCE_sun50i="1"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ SRC_URI += " \
file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://boot.cmd \ file://boot.cmd \
" "
SRCREV = "f88b6facb87dc4a52f1630eb9d858c0f54c6628e"
PV = "v2018.09+git${SRCPV}"
PE = "2"
S = "${WORKDIR}/git"
UBOOT_ENV_SUFFIX = "scr" UBOOT_ENV_SUFFIX = "scr"
UBOOT_ENV = "boot" UBOOT_ENV = "boot"