aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-06-20 12:33:42 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-06-20 12:53:53 +0200
commit103c42e2954035a03d13046606ca680330456c16 (patch)
treed58810e8d490e44dc9cf76f896aefecd6111ec04
parentfd4e8058467e8bf794f7ad2e0feab1ece783cd33 (diff)
downloadupstream-103c42e2954035a03d13046606ca680330456c16.tar.gz
upstream-103c42e2954035a03d13046606ca680330456c16.tar.bz2
upstream-103c42e2954035a03d13046606ca680330456c16.zip
layerscape: Adapt patch to changes in upstream kernel
In kernel v4.4.179 the structure of the scripts/mod/file2alias.c file changed, this adapts the patch to the changes done in the stable kernel. This fixes the following compile problem: HOSTCC scripts/mod/file2alias.o scripts/mod/file2alias.c:1199:17: error: expected declaration specifiers or '...' before string constant ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry); ^ scripts/mod/file2alias.c:1199:26: error: unknown type name 'fsl_mc_device_id' ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry); ^ scripts/mod/file2alias.c:1199:44: error: expected declaration specifiers or '...' before 'do_fsl_mc_entry' ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry); ^ scripts/mod/file2alias.c:1190:12: warning: 'do_fsl_mc_entry' defined but not used [-Wunused-function] static int do_fsl_mc_entry(const char *filename, void *symval, ^ SHIPPED scripts/dtc/dtc-parser.tab.h Fixes: 6c5c3a2edccf ("kernel: Update to version 4.4.182") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/layerscape/patches-4.4/7182-staging-fsl-mc-add-support-for-device-table-matching.patch11
1 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.4/7182-staging-fsl-mc-add-support-for-device-table-matching.patch b/target/linux/layerscape/patches-4.4/7182-staging-fsl-mc-add-support-for-device-table-matching.patch
index 67184e14a0..85a4ec2b03 100644
--- a/target/linux/layerscape/patches-4.4/7182-staging-fsl-mc-add-support-for-device-table-matching.patch
+++ b/target/linux/layerscape/patches-4.4/7182-staging-fsl-mc-add-support-for-device-table-matching.patch
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
}
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
-@@ -1186,6 +1186,18 @@ static int do_hda_entry(const char *file
+@@ -1186,6 +1186,17 @@ static int do_hda_entry(const char *file
return 1;
}
@@ -91,8 +91,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ sprintf(alias, "fsl-mc:v%08Xd%s", vendor, *obj_type);
+ return 1;
+}
-+ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry);
+
/* Does namelen bytes of name exactly match the symbol? */
static bool sym_is(const char *name, unsigned namelen, const char *symbol)
{
+@@ -1251,6 +1262,7 @@ static const struct devtable devtable[]
+ {"rapidio", SIZE_rio_device_id, do_rio_entry},
+ {"ulpi", SIZE_ulpi_device_id, do_ulpi_entry},
+ {"hdaudio", SIZE_hda_device_id, do_hda_entry},
++ {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},
+ {"of", SIZE_of_device_id, do_of_entry},
+ };
+