Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FS#2588 - ath79: make kernel_menuconfig removes PCI-related CONFIG_OF entries #7439

Closed
openwrt-bot opened this issue Nov 11, 2019 · 3 comments
Labels

Comments

@openwrt-bot
Copy link

jeffsf:

make kernel_menuconfig unexpectedly removes several CONFIG_OF entries

~/devel/openwrt$ git diff
diff --git a/target/linux/ath79/config-4.19 b/target/linux/ath79/config-4.19
index 42843a1858..dc5369a502 100644
--- a/target/linux/ath79/config-4.19
+++ b/target/linux/ath79/config-4.19
@@ -21,6 +21,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ATH79=y
CONFIG_ATH79_WDT=y
CONFIG_BLK_MQ_PCI=y
+CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CEVT_R4K=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_CLONE_BACKWARDS=y
@@ -179,7 +180,6 @@ CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
CONFIG_NVMEM=y
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_GPIO=y
@@ -187,8 +187,6 @@ CONFIG_OF_IRQ=y
CONFIG_OF_KOBJ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
CONFIG_PCI=y
CONFIG_PCI_AR71XX=y
CONFIG_PCI_AR724X=y

To replicate:

  • Check out master (HEAD of commit 1c32123 used today to confirm)
  • rm -rf tmp
  • make -j12 clean
  • Run make menuconfig to configure for "standard" ath79
  • Confirm with ./scripts/diffconfig.sh
    CONFIG_TARGET_ath79=y
    CONFIG_TARGET_ath79_generic=y
    CONFIG_TARGET_ath79_generic_Default=y
  • make -j12 toolchain/install
  • make kernel_menuconfig
  • Exit without making any changes
  • git diff

Shows the changes indicated above

Expected behavior -- no changes

@openwrt-bot
Copy link
Author

adrianschmutzler:

Confirmed (starting from scratch).

@openwrt-bot
Copy link
Author

ynezz:

  • for obsolete PCI symbols, please try following patch https://patchwork.ozlabs.org/patch/1193141/
  • for CONFIG_CC_HAS_ASM_GOTO I would incline to "won't fix" resolution, as this is runtime option and thus might change

@openwrt-bot
Copy link
Author

jeffsf:

Confirmed referenced patch on ath79-nand GL-AR750S (NOR/NAND) relative to current state of #2184

I don't have an opinion one way or the other on CONFIG_CC_HAS_ASM_GOTO

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant