Skip to content

Commit

Permalink
imx: keep common kernel symbols in target's config
Browse files Browse the repository at this point in the history
Move common kernel symbols from subtargets to target config.

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
  • Loading branch information
pepe2k committed Jul 11, 2022
1 parent e62f138 commit 28e4761
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
9 changes: 7 additions & 2 deletions target/linux/imx/config-5.15
Expand Up @@ -24,6 +24,7 @@ CONFIG_ARM_ERRATA_775420=y
CONFIG_ARM_ERRATA_814220=y
CONFIG_ARM_HAS_SG_CHAIN=y
CONFIG_ARM_HEAVY_MB=y
# CONFIG_ARM_IMX6Q_CPUFREQ is not set
# CONFIG_ARM_IMX_CPUFREQ_DT is not set
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
Expand Down Expand Up @@ -159,10 +160,11 @@ CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXTCON=y
CONFIG_F2FS_FS=y
# CONFIG_FEC is not set
CONFIG_FEC=y
CONFIG_FIXED_PHY=y
CONFIG_FIX_EARLYCON_MEM=y
# CONFIG_FSL_DPAA2_SWITCH is not set
CONFIG_FSL_GUTS=y
CONFIG_FS_ENCRYPTION=y
CONFIG_FS_ENCRYPTION_ALGS=y
CONFIG_FS_IOMAP=y
Expand Down Expand Up @@ -258,7 +260,9 @@ CONFIG_MMC_BLOCK=y
CONFIG_MMC_CQHCI=y
# CONFIG_MMC_MXC is not set
CONFIG_MMC_SDHCI=y
# CONFIG_MMC_SDHCI_ESDHC_IMX is not set
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
CONFIG_MMC_SDHCI_OF_ESDHC=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MPILIB=y
Expand Down Expand Up @@ -339,6 +343,7 @@ CONFIG_RD_XZ=y
CONFIG_REGMAP=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RESET_CONTROLLER=y
CONFIG_RFS_ACCEL=y
Expand Down
7 changes: 0 additions & 7 deletions target/linux/imx/cortexa7/config-default
@@ -1,6 +1,5 @@
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_GIC=y
# CONFIG_ARM_IMX6Q_CPUFREQ is not set
CONFIG_ARM_IMX_CPUFREQ_DT=y
CONFIG_ARM_PSCI=y
CONFIG_ARM_PSCI_FW=y
Expand Down Expand Up @@ -47,14 +46,12 @@ CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_FILLRECT=y
CONFIG_FB_SYS_FOPS=y
CONFIG_FB_SYS_IMAGEBLIT=y
CONFIG_FEC=y
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
CONFIG_FONT_SUPPORT=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FSL_GUTS=y
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_HDMI=y
CONFIG_HW_CONSOLE=y
Expand All @@ -67,9 +64,6 @@ CONFIG_JFFS2_FS=y
CONFIG_KCMP=y
CONFIG_LEDS_GPIO=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
CONFIG_MMC_SDHCI_OF_ESDHC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPLIT_FIRMWARE=y
CONFIG_MTD_SPLIT_FIT_FW=y
Expand All @@ -79,7 +73,6 @@ CONFIG_PINCTRL_IMX6UL=y
CONFIG_PINCTRL_IMX7D=y
CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_REGULATOR_ANATOP=y
CONFIG_RESET_IMX7=y
CONFIG_SOC_IMX6=y
CONFIG_SOC_IMX6UL=y
Expand Down
6 changes: 0 additions & 6 deletions target/linux/imx/cortexa9/config-default
Expand Up @@ -12,8 +12,6 @@ CONFIG_CMDLINE_EXTEND=y
CONFIG_E1000E=y
CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
CONFIG_EXTRA_FIRMWARE_DIR="firmware"
CONFIG_FEC=y
CONFIG_FSL_GUTS=y
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_GENERIC_MSI_IRQ=y
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
Expand All @@ -24,9 +22,6 @@ CONFIG_HW_RANDOM_IMX_RNGC=y
# CONFIG_INITRAMFS_FORCE is not set
CONFIG_MARVELL_PHY=y
CONFIG_MICREL_PHY=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
CONFIG_MMC_SDHCI_OF_ESDHC=y
# CONFIG_MMC_SDHCI_PCI is not set
CONFIG_NET_DSA_MV88E6XXX=y
CONFIG_PCI=y
Expand All @@ -47,7 +42,6 @@ CONFIG_PINCTRL_IMX6SX=y
CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_REGMAP_I2C=y
CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_LTC3676=y
CONFIG_REGULATOR_PFUZE100=y
CONFIG_RTC_DRV_DS1307=y
Expand Down

0 comments on commit 28e4761

Please sign in to comment.