From fd5c16870169bb76dd3d3bcfbcc6a112f74aeefe Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 11 Jan 2019 18:05:11 +0100 Subject: kernel: Build: Split kmod-regmap This reduces the needed modifications to the mainline Linux kernel and also makes the regmap package work with an out of tree kernel which does not have these modifications. The regmap-core is only added when it is really build as a module. The regmap-core is normally bool so it cannot be built as a module in an unmodified kernel. When it is selected by on other kernel module it will always be selected as build in and it also does not show up in $(LINUX_DIR)/modules.builtin as it is not supposed to be a kernel module. When it is not in $(LINUX_DIR)/modules.builtin the build system expects it to be built as a .ko file. Just check if the module is really there and only add it in that case. This splits the regmap package into multiple packages, one for each bus type. This way only the bus maps which are really needed have to be added. This also splits the I2C, SPI and MMIO regmap into separate packages to not require all these subsystems to build them, on an unmodified upstream kernel this also causes problems in some situations. Signed-off-by: Hauke Mehrtens --- target/linux/generic/hack-4.19/259-regmap_dynamic.patch | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'target/linux/generic/hack-4.19') diff --git a/target/linux/generic/hack-4.19/259-regmap_dynamic.patch b/target/linux/generic/hack-4.19/259-regmap_dynamic.patch index 1c5e1164e2..335ec4afc5 100644 --- a/target/linux/generic/hack-4.19/259-regmap_dynamic.patch +++ b/target/linux/generic/hack-4.19/259-regmap_dynamic.patch @@ -21,26 +21,22 @@ Signed-off-by: Felix Fietkau - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ) select IRQ_DOMAIN if REGMAP_IRQ - bool -+ tristate "Regmap" ++ tristate config REGCACHE_COMPRESSED select LZO_COMPRESS -@@ -17,7 +16,8 @@ config REGMAP_AC97 - tristate +@@ -18,6 +17,7 @@ config REGMAP_AC97 config REGMAP_I2C -- tristate -+ tristate "Regmap I2C" + tristate + select REGMAP depends on I2C config REGMAP_SLIMBUS -@@ -25,21 +25,27 @@ config REGMAP_SLIMBUS - depends on SLIMBUS +@@ -26,20 +26,26 @@ config REGMAP_SLIMBUS config REGMAP_SPI -- tristate -+ tristate "Regmap SPI" + tristate + select REGMAP + depends on SPI_MASTER depends on SPI @@ -56,8 +52,7 @@ Signed-off-by: Felix Fietkau depends on W1 config REGMAP_MMIO -- tristate -+ tristate "Regmap MMIO" + tristate + select REGMAP config REGMAP_IRQ -- cgit v1.2.3