summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/files
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commit6116dbfcecc9499e230a90ebfe31dfb1c51239a4 (patch)
treed6982dec2dcef029fe8cb282436255fabf38190c /meta/recipes-bsp/u-boot/files
parentecba98085f9d7f1bdffc828c6252eb63d0a36d3d (diff)
downloadpoky-6116dbfcecc9499e230a90ebfe31dfb1c51239a4.tar.gz
u-boot: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 7e8273cb55df71eaaf2cd50db076b73229ef7566) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot/files')
-rw-r--r--meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
index cea52b79e6..ecaa1796a4 100644
--- a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
+++ b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
@@ -5,15 +5,15 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 6Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
7 7
8diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig 8Index: git/configs/MPC8315ERDB_defconfig
9index 4e2b705..b02ab1f 100644 9===================================================================
10--- a/configs/MPC8315ERDB_defconfig 10--- git.orig/configs/MPC8315ERDB_defconfig
11+++ b/configs/MPC8315ERDB_defconfig 11+++ git/configs/MPC8315ERDB_defconfig
12@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y 12@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y
13 CONFIG_CMD_I2C=y 13 CONFIG_CMD_SATA=y
14 CONFIG_CMD_USB=y 14 CONFIG_CMD_USB=y
15 # CONFIG_CMD_SETEXPR is not set 15 # CONFIG_CMD_SETEXPR is not set
16+CONFIG_CMD_DHCP=y 16+CONFIG_CMD_DHCP=y
17 CONFIG_CMD_MII=y 17 CONFIG_CMD_MII=y
18 CONFIG_CMD_PING=y 18 CONFIG_CMD_PING=y
19 CONFIG_CMD_EXT2=y 19 CONFIG_CMD_DATE=y