Disable SoCs and PCI options in the common ath25 kernel config and enable required options on per-subtarget basis. E.g. generic config activates all SoCs but keeps PCI support disabled, and fon2202 config activates only AR2315 but with the PCI support.
Signed-off-by: Sergey Ryazanov <[email protected]> --- target/linux/ath25/config-4.14 | 14 ++------------ target/linux/ath25/fon2202/config-default | 10 ++++++++++ target/linux/ath25/generic/config-default | 6 ++++++ 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 target/linux/ath25/fon2202/config-default create mode 100644 target/linux/ath25/generic/config-default diff --git a/target/linux/ath25/config-4.14 b/target/linux/ath25/config-4.14 index 4d3f0c697e..742c8fd78c 100644 --- a/target/linux/ath25/config-4.14 +++ b/target/linux/ath25/config-4.14 @@ -23,7 +23,6 @@ CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ATH25=y -CONFIG_BLK_MQ_PCI=y CONFIG_CEVT_R4K=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2" @@ -60,8 +59,6 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y -CONFIG_GPIO_AR2315=y -CONFIG_GPIO_AR5312=y CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y @@ -103,7 +100,6 @@ CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y CONFIG_HZ_PERIODIC=y CONFIG_INITRAMFS_SOURCE="" @@ -125,7 +121,6 @@ CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MACHINE is not set CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MTD_AR2315=y CONFIG_MTD_CFI_ADV_OPTIONS=y # CONFIG_MTD_CFI_GEOMETRY is not set # CONFIG_MTD_CFI_INTELEXT is not set @@ -140,10 +135,6 @@ CONFIG_NET_AR231X=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y # CONFIG_NO_IOPORT_MAP is not set # CONFIG_OF is not set -CONFIG_PCI=y -CONFIG_PCI_AR2315=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y -CONFIG_PCI_DOMAINS=y CONFIG_PCI_DRIVERS_LEGACY=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 @@ -155,8 +146,8 @@ CONFIG_PHYLIB=y # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -CONFIG_SOC_AR2315=y -CONFIG_SOC_AR5312=y +# CONFIG_SOC_AR2315 is not set +# CONFIG_SOC_AR5312 is not set CONFIG_SRCU=y # CONFIG_SWAP is not set CONFIG_SWCONFIG=y @@ -168,4 +159,3 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y -CONFIG_USB_SUPPORT=y diff --git a/target/linux/ath25/fon2202/config-default b/target/linux/ath25/fon2202/config-default new file mode 100644 index 0000000000..ca9ca2f3d7 --- /dev/null +++ b/target/linux/ath25/fon2202/config-default @@ -0,0 +1,10 @@ +CONFIG_BLK_MQ_PCI=y +CONFIG_GPIO_AR2315=y +CONFIG_HW_HAS_PCI=y +CONFIG_MTD_AR2315=y +CONFIG_PCI=y +CONFIG_PCI_AR2315=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_SOC_AR2315=y +CONFIG_USB_SUPPORT=y diff --git a/target/linux/ath25/generic/config-default b/target/linux/ath25/generic/config-default new file mode 100644 index 0000000000..3d7551110b --- /dev/null +++ b/target/linux/ath25/generic/config-default @@ -0,0 +1,6 @@ +CONFIG_GPIO_AR2315=y +CONFIG_GPIO_AR5312=y +CONFIG_MTD_AR2315=y +# CONFIG_PCI_AR2315 is not set +CONFIG_SOC_AR2315=y +CONFIG_SOC_AR5312=y -- 2.16.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/listinfo/openwrt-devel
