Merge pull request #385 from retpolanne/master

Fixes Upstream-Status lines in a few u-boot patches
This commit is contained in:
Marek Belisko 2023-07-03 14:37:40 +02:00 committed by GitHub
commit 441baea0ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -3,7 +3,7 @@ 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>
--- ---

View File

@ -5,6 +5,8 @@ Subject: [PATCH] Added nanopi-r1 board support
Patch taken from : https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nanopi-r1-and-duo2.patch Patch taken from : https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nanopi-r1-and-duo2.patch
Upstream-Status: Pending
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
--- ---
diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig