summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2016-04-11 07:19:22 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-04-11 11:27:34 (GMT)
commitaf23a97e6083dbce7b99e6fd8a8ca79441b4bea9 (patch)
treed55c8099887dbdb6bbe0df2fab27ebffc56800bf
parentf81eadec2261c0f514e695d7030ea8d7cb4534b6 (diff)
downloadmeta-phytec-af23a97e6083dbce7b99e6fd8a8ca79441b4bea9.zip
meta-phytec-af23a97e6083dbce7b99e6fd8a8ca79441b4bea9.tar.bz2
linux-mainline: remove not needed resetdriver.cfg
Removed not needed resetdriver.cfg. It doesn't change anything in the config. It's seems to be a leftover from a ti kernel recipe, because it tries to enable CONFIG_RESET_TI which is not available in the linux-mainline i.MX6 build. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-kernel/linux/linux-mainline/features/resetdriver.cfg3
-rw-r--r--recipes-kernel/linux/linux-mainline_4.1.18-phy4.bb3
2 files changed, 1 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-mainline/features/resetdriver.cfg b/recipes-kernel/linux/linux-mainline/features/resetdriver.cfg
deleted file mode 100644
index 842a875..0000000
--- a/recipes-kernel/linux/linux-mainline/features/resetdriver.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_TI=y
diff --git a/recipes-kernel/linux/linux-mainline_4.1.18-phy4.bb b/recipes-kernel/linux/linux-mainline_4.1.18-phy4.bb
index e9a7d10..a9d46e8 100644
--- a/recipes-kernel/linux/linux-mainline_4.1.18-phy4.bb
+++ b/recipes-kernel/linux/linux-mainline_4.1.18-phy4.bb
@@ -12,10 +12,9 @@ SRC_URI = "${GIT_URL};branch=${BRANCH};protocol=git"
SRC_URI_append = " \
file://ipv6.cfg \
file://systemd.cfg \
- file://resetdriver.cfg \
"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
# NOTE: PV must be in the format "x.y.z-.*". It cannot begin with a 'v'.
# NOTE: Keep version in filename in sync with commit id!