Change in ...coreboot[master]: Makefile.inc: Remove unnecessary CONFIG_ARCH_RAMSTAGE_X86_32 dependency
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33113
Change subject: Makefile.inc: Remove unnecessary CONFIG_ARCH_RAMSTAGE_X86_32 dependency ......................................................................
Makefile.inc: Remove unnecessary CONFIG_ARCH_RAMSTAGE_X86_32 dependency
Change-Id: Ic9d1a95e80178775dd78e756f97f6da13a24dc95 Signed-off-by: Subrata Banik subrata.banik@intel.com --- M src/arch/x86/Makefile.inc M src/lib/Makefile.inc 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/33113/1
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 6e4ee76..7e518d8 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -193,7 +193,7 @@ verstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c verstage-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S
-verstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c +verstage-y += cpu_common.c verstage-y += memset.c verstage-y += memcpy.c verstage-y += memmove.c @@ -230,7 +230,7 @@ romstage-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += gdt_init.S romstage-y += cbmem.c romstage-y += cbfs_and_run.c -romstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c +romstage-y += cpu_common.c romstage-$(CONFIG_EARLY_EBDA_INIT) += ebda.c romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 1350152..b28be84 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -104,7 +104,7 @@ verstage-$(CONFIG_ARCH_VERSTAGE_X86_32) += gcc.c romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += gcc.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += gcc.c -smm-$(CONFIG_ARCH_RAMSTAGE_X86_32) += gcc.c +smm-y += gcc.c endif
romstage-$(CONFIG_GENERIC_UDELAY) += timer.c @@ -272,7 +272,7 @@
ifeq ($(CONFIG_RELOCATABLE_MODULES),y) ramstage-y += rmodule.c -romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c +romstage-y += rmodule.c
RMODULE_LDFLAGS := -z defs -Bsymbolic
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33113 )
Change subject: Makefile.inc: Remove unnecessary CONFIG_ARCH_RAMSTAGE_X86_32 dependency ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/33113/1/src/lib/Makefile.inc File src/lib/Makefile.inc:
https://review.coreboot.org/#/c/33113/1/src/lib/Makefile.inc@275 PS1, Line 275: y What did this have to do with ramstage_x86_32?
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33113 )
Change subject: Makefile.inc: Remove unnecessary CONFIG_ARCH_RAMSTAGE_X86_32 dependency ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/33113/1/src/lib/Makefile.inc File src/lib/Makefile.inc:
https://review.coreboot.org/#/c/33113/1/src/lib/Makefile.inc@275 PS1, Line 275: y
What did this have to do with ramstage_x86_32?
i will fix commit msg
Hello ron minnich, build bot (Jenkins), Patrick Georgi, Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33113
to look at the new patch set (#2).
Change subject: Makefile.inc: Remove unnecessary CONFIG dependency ......................................................................
Makefile.inc: Remove unnecessary CONFIG dependency
This patch removes unnecessary kconfig depencies as below 1. CONFIG_ARCH_RAMSTAGE_X86_32 2. CONFIG_RELOCATABLE_RAMSTAGE
Include required files as is without specify kconfig option.
Change-Id: Ic9d1a95e80178775dd78e756f97f6da13a24dc95 Signed-off-by: Subrata Banik subrata.banik@intel.com --- M src/arch/x86/Makefile.inc M src/lib/Makefile.inc 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/33113/2
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33113 )
Change subject: Makefile.inc: Remove unnecessary CONFIG dependency ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/33113/1/src/lib/Makefile.inc File src/lib/Makefile.inc:
https://review.coreboot.org/#/c/33113/1/src/lib/Makefile.inc@275 PS1, Line 275: y
i will fix commit msg
fixed commit msg now
ron minnich has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33113 )
Change subject: Makefile.inc: Remove unnecessary CONFIG dependency ......................................................................
Patch Set 5: Code-Review+2
Patch Set 1:
(1 comment)
looks fine now
Subrata Banik has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33113 )
Change subject: Makefile.inc: Remove unnecessary CONFIG dependency ......................................................................
Makefile.inc: Remove unnecessary CONFIG dependency
This patch removes unnecessary kconfig depencies as below 1. CONFIG_ARCH_RAMSTAGE_X86_32 2. CONFIG_RELOCATABLE_RAMSTAGE
Include required files as is without specify kconfig option.
Change-Id: Ic9d1a95e80178775dd78e756f97f6da13a24dc95 Signed-off-by: Subrata Banik subrata.banik@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/33113 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: ron minnich rminnich@gmail.com --- M src/arch/x86/Makefile.inc M src/lib/Makefile.inc 2 files changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified ron minnich: Looks good to me, approved
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 6e4ee76..7e518d8 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -193,7 +193,7 @@ verstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c verstage-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S
-verstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c +verstage-y += cpu_common.c verstage-y += memset.c verstage-y += memcpy.c verstage-y += memmove.c @@ -230,7 +230,7 @@ romstage-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += gdt_init.S romstage-y += cbmem.c romstage-y += cbfs_and_run.c -romstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c +romstage-y += cpu_common.c romstage-$(CONFIG_EARLY_EBDA_INIT) += ebda.c romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 913675b..1b8ad19 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -104,7 +104,7 @@ verstage-$(CONFIG_ARCH_VERSTAGE_X86_32) += gcc.c romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += gcc.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += gcc.c -smm-$(CONFIG_ARCH_RAMSTAGE_X86_32) += gcc.c +smm-y += gcc.c endif
romstage-$(CONFIG_GENERIC_UDELAY) += timer.c @@ -279,7 +279,7 @@
ifeq ($(CONFIG_RELOCATABLE_MODULES),y) ramstage-y += rmodule.c -romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c +romstage-y += rmodule.c
RMODULE_LDFLAGS := -z defs -Bsymbolic
-
Aaron Durbin (Code Review) -
ron minnich (Code Review)
-
Subrata Banik (Code Review)