[U-Boot] [PATCH 1/2] pci: Only link pci_rom.o in some cases

The content of pci_rom.c is only used in a few cases. Only build and link in these cases to avoid a global variable as gcc doesn't always discard those when they are unused.
Signed-off-by: Tom Rini trini@konsulko.com --- drivers/pci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 219473aa7924..da8b826d69c3 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -4,12 +4,12 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
ifneq ($(CONFIG_DM_PCI),) -obj-y += pci_rom.o +obj-$(CONFIG_DM_VIDEO) += pci_rom.o obj-$(CONFIG_PCI) += pci-uclass.o pci_auto.o obj-$(CONFIG_DM_PCI_COMPAT) += pci_compat.o obj-$(CONFIG_PCI_SANDBOX) += pci_sandbox.o obj-$(CONFIG_SANDBOX) += pci-emul-uclass.o -obj-$(CONFIG_X86) += pci_x86.o +obj-$(CONFIG_X86) += pci_x86.o pci_rom.o else obj-$(CONFIG_PCI) += pci.o pci_auto_old.o endif

The array 'mtd_table' is unused in the code. Remove this as gcc doesn't always discard unused global variables.
Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/mtdcore.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 89ac8229f584..dd04d676d56c 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -76,8 +76,6 @@ static struct class mtd_class = { .resume = mtd_cls_resume, }; #else -struct mtd_info *mtd_table[MAX_MTD_DEVICES]; - #define MAX_IDR_ID 64
struct idr_layer {

On Tue, Nov 26, 2019 at 08:41:00PM -0500, Tom Rini wrote:
The array 'mtd_table' is unused in the code. Remove this as gcc doesn't always discard unused global variables.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

On Tue, Nov 26, 2019 at 08:40:59PM -0500, Tom Rini wrote:
The content of pci_rom.c is only used in a few cases. Only build and link in these cases to avoid a global variable as gcc doesn't always discard those when they are unused.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (1)
-
Tom Rini