openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/configs
History
Clay McClure 92db978f0d net: ethernet: ti: Remove TI_CPTS_MOD workaround 
My recent commit b6d49cab44 ("net: Make PTP-specific drivers depend on
PTP_1588_CLOCK") exposes a missing dependency in defconfigs that select
TI_CPTS without selecting PTP_1588_CLOCK, leading to linker errors of the
form:

drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_stop':
cpsw.c:(.text+0x680): undefined reference to `cpts_unregister'
 ...

That's because TI_CPTS_MOD (which is the symbol gating the _compilation_ of
cpts.c) now depends on PTP_1588_CLOCK, and so is not enabled in these
configurations, but TI_CPTS (which is the symbol gating _calls_ to the cpts
functions) _is_ enabled. So we end up compiling calls to functions that
don't exist, resulting in the linker errors.

This patch fixes build errors and restores previous behavior by:
 - ensure PTP_1588_CLOCK=y in TI specific configs and CPTS will be built
 - remove TI_CPTS_MOD and, instead, add dependencies from CPTS in
   TI_CPSW/TI_KEYSTONE_NETCP/TI_CPSW_SWITCHDEV as below:

   config TI_CPSW_SWITCHDEV
   ...
    depends on TI_CPTS || !TI_CPTS

   which will ensure proper dependencies PTP_1588_CLOCK -> TI_CPTS ->
TI_CPSW/TI_KEYSTONE_NETCP/TI_CPSW_SWITCHDEV and build type selection.

Note. For NFS boot + CPTS all of above configs have to be built-in.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dan Murphy <dmurphy@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Fixes: b6d49cab44 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Clay McClure <clay@daemons.net>
[grygorii.strashko@ti.com: rewording, add deps cpsw/netcp from cpts, drop IS_REACHABLE]
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 		2020-05-12 12:33:27 -07:00
..
am200epdkit_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
aspeed_g4_defconfig ARM: config: aspeed-g4: Add MMC, and cleanup 2019-11-13 14:38:30 +10:30
aspeed_g5_defconfig ARM: config: aspeed-g5: Add SGPIO and FSI drivers 2019-11-13 14:38:26 +10:30
assabet_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
at91_dt_defconfig ARM: configs: at91: enable sama5d4 compatible watchdog 2020-02-12 12:29:22 +01:00
axm55xx_defconfig arm: Remove KVM from config files 2020-03-24 10:55:50 +00:00
badge4_defconfig USB: rio500: Remove Rio 500 kernel driver 2019-10-04 10:53:36 +02:00
bcm2835_defconfig ARM: defconfig updates 2020-04-03 15:15:10 -07:00
cerfcube_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
clps711x_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
cm_x2xx_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
cm_x300_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
cns3420vb_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
colibri_pxa270_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
colibri_pxa300_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
collie_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
corgi_defconfig USB: rio500: Remove Rio 500 kernel driver 2019-10-04 10:53:36 +02:00
davinci_all_defconfig drm/bridge: dumb-vga-dac: Rename driver to simple-bridge 2020-02-26 13:31:31 +02:00
dove_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
dram_0x00000000.config ARM: configs: Add new config fragment to change RAM start point 2016-02-17 17:31:30 +01:00
dram_0xc0000000.config ARM: configs: Add new config fragment to change RAM start point 2016-11-26 00:20:09 +01:00
dram_0xd0000000.config ARM: configs: Add new config fragment to change RAM start point 2017-03-31 14:19:40 +02:00
ebsa110_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
efm32_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
em_x270_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
ep93xx_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
eseries_pxa_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
exynos_defconfig ARM: exynos_defconfig: Add more drivers for GalaxyS3/Trats2 2020-02-29 15:22:08 +01:00
ezx_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
footbridge_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
gemini_defconfig ARM: defconfig: gemini: Update defconfig 2020-01-06 09:24:32 -08:00
h3600_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
h5000_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
hackkit_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
hisi_defconfig irqdomain: Kill CONFIG_IRQ_DOMAIN_DEBUG 2018-01-24 12:32:58 +01:00
imote2_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
imx_v4_v5_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
imx_v6_v7_defconfig ARM: imx_v6_v7_defconfig: Enable TOUCHSCREEN_AD7879 2020-02-14 16:37:22 +08:00
integrator_defconfig drm/bridge: dumb-vga-dac: Rename driver to simple-bridge 2020-02-26 13:31:31 +02:00
iop32x_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
ixp4xx_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
jornada720_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
keystone_defconfig net: ethernet: ti: Remove TI_CPTS_MOD workaround 2020-05-12 12:33:27 -07:00
lart_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
lpc18xx_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
lpc32xx_defconfig sysctl: Remove the sysctl system call 2019-11-26 13:03:56 -06:00
lpd270_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
lubbock_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
magician_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
mainstone_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
milbeaut_m10v_defconfig ARM: configs: Add Milbeaut M10V defconfig 2019-03-01 15:18:54 +01:00
mini2440_defconfig Samsung defconfig changes for v5.3 2019-06-26 19:27:25 -07:00
mmp2_defconfig ARM: config: Remove left-over BACKLIGHT_LCD_SUPPORT 2019-06-19 07:02:07 -07:00
moxart_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
mps2_defconfig configs: get rid of obsolete CONFIG_ENABLE_WARN_DEPRECATED 2019-03-07 18:32:02 -08:00
multi_v4t_defconfig ARM: defconfig: re-run savedefconfig on multi_v* configs 2019-12-05 13:20:18 -08:00
multi_v5_defconfig ARM: defconfig: re-run savedefconfig on multi_v* configs 2019-12-05 13:20:18 -08:00
multi_v7_defconfig ARM: defconfig updates 2020-04-03 15:15:10 -07:00
mv78xx0_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
mvebu_v5_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
mvebu_v7_defconfig ARM: SoC defconfig updates 2019-07-19 17:27:27 -07:00
mxs_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
neponset_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
netwinder_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
nhk8815_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
omap1_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
omap2plus_defconfig net: ethernet: ti: Remove TI_CPTS_MOD workaround 2020-05-12 12:33:27 -07:00
orion5x_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
oxnas_v6_defconfig mtd: rawnand: Clarify Kconfig entry MTD_NAND 2019-04-18 08:54:00 +02:00
palmz72_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
pcm027_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
pleb_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
prima2_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
pxa3xx_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
pxa168_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
pxa255-idp_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
pxa910_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
pxa_defconfig USB: rio500: Remove Rio 500 kernel driver 2019-10-04 10:53:36 +02:00
qcom_defconfig ARM: qcom_defconfig: Enable QRTR 2020-03-09 13:13:02 -07:00
realview_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
rpc_defconfig scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled 2020-02-24 14:59:01 -05:00
s3c2410_defconfig scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled 2020-02-24 14:59:01 -05:00
s3c6400_defconfig Samsung defconfig changes for v5.3 2019-06-26 19:27:25 -07:00
s5pv210_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
sama5_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
shannon_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
shmobile_defconfig drm/bridge: dumb-vga-dac: Rename driver to simple-bridge 2020-02-26 13:31:31 +02:00
simpad_defconfig ARM: defconfig: Cleanup from old Kconfig options 2017-06-10 19:28:57 +02:00
socfpga_defconfig ARM: socfpga_defconfig: Add back DEBUG_FS 2020-03-04 04:06:27 -06:00
spear3xx_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
spear6xx_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
spear13xx_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
spitz_defconfig USB: rio500: Remove Rio 500 kernel driver 2019-10-04 10:53:36 +02:00
stm32_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
sunxi_defconfig drm/bridge: dumb-vga-dac: Rename driver to simple-bridge 2020-02-26 13:31:31 +02:00
tango4_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
tct_hammer_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
tegra_defconfig ARM: tegra: Enable Tegra cpuidle driver in tegra_defconfig 2020-03-12 11:05:00 +01:00
trizeps4_defconfig ARM: config: Remove left-over BACKLIGHT_LCD_SUPPORT 2019-06-19 07:02:07 -07:00
u300_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
u8500_defconfig ARM: defconfig: u8500: activate cpufreq 2019-12-17 14:20:03 -08:00
versatile_defconfig drm/bridge: dumb-vga-dac: Rename driver to simple-bridge 2020-02-26 13:31:31 +02:00
vexpress_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
vf610m4_defconfig firmware: Drop FIRMWARE_IN_KERNEL Kconfig option 2018-01-25 12:46:30 +01:00
viper_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
vt8500_v6_v7_defconfig irqdomain: Kill CONFIG_IRQ_DOMAIN_DEBUG 2018-01-24 12:32:58 +01:00
xcep_defconfig ARM: configs: Remove useless UEVENT_HELPER_PATH 2019-06-19 07:09:39 -07:00
zeus_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00
zx_defconfig ARM: configs: Cleanup old Kconfig options 2020-02-09 03:44:58 -08:00