Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47849 )
Change subject: mb/kontron/bsl6: Use include folder for header files ......................................................................
mb/kontron/bsl6: Use include folder for header files
Change-Id: Id73a7385f7701920efebaa3e293ac50a6ba93272 Signed-off-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/kontron/bsl6/Makefile.inc R src/mainboard/kontron/bsl6/include/mainboard/gpio.h R src/mainboard/kontron/bsl6/include/variant.h M src/mainboard/kontron/bsl6/ramstage.c M src/mainboard/kontron/bsl6/romstage.c M src/mainboard/kontron/bsl6/variants/boxer26/romstage.c M src/mainboard/kontron/bsl6/variants/bsl6/romstage.c 7 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/47849/1
diff --git a/src/mainboard/kontron/bsl6/Makefile.inc b/src/mainboard/kontron/bsl6/Makefile.inc index 1e12ee4..49c9a6c 100644 --- a/src/mainboard/kontron/bsl6/Makefile.inc +++ b/src/mainboard/kontron/bsl6/Makefile.inc @@ -1,5 +1,7 @@ ## SPDX-License-Identifier: GPL-2.0-only
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include + bootblock-y += bootblock.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c diff --git a/src/mainboard/kontron/bsl6/gpio.h b/src/mainboard/kontron/bsl6/include/mainboard/gpio.h similarity index 100% rename from src/mainboard/kontron/bsl6/gpio.h rename to src/mainboard/kontron/bsl6/include/mainboard/gpio.h diff --git a/src/mainboard/kontron/bsl6/variant.h b/src/mainboard/kontron/bsl6/include/variant.h similarity index 100% rename from src/mainboard/kontron/bsl6/variant.h rename to src/mainboard/kontron/bsl6/include/variant.h diff --git a/src/mainboard/kontron/bsl6/ramstage.c b/src/mainboard/kontron/bsl6/ramstage.c index 2664a4f..b26c62f 100644 --- a/src/mainboard/kontron/bsl6/ramstage.c +++ b/src/mainboard/kontron/bsl6/ramstage.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/ramstage.h> -#include "gpio.h" +#include <mainboard/gpio.h>
void mainboard_silicon_init_params(FSP_SIL_UPD *params) { diff --git a/src/mainboard/kontron/bsl6/romstage.c b/src/mainboard/kontron/bsl6/romstage.c index 9d9169c..0cb7b06 100644 --- a/src/mainboard/kontron/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/romstage.c @@ -8,8 +8,7 @@ #include <soc/romstage.h> #include <fsp/soc_binding.h> #include <pc80/mc146818rtc.h> - -#include "variant.h" +#include <variant.h>
/* Rcomp resistor */ static const u16 rcomp_resistors[3] = { 121, 75, 100 }; diff --git a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c index 9c14d84..f1409e0 100644 --- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c @@ -5,8 +5,7 @@ #include <console/console.h> #include <pc80/mc146818rtc.h> #include <fsp/soc_binding.h> - -#include "../../variant.h" +#include <variant.h>
void variant_memory_init_params(FSPM_UPD *const mupd) { diff --git a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c index 8b32bf5..c9122c1 100644 --- a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <fsp/soc_binding.h> - -#include "../../variant.h" +#include <variant.h>
void variant_memory_init_params(FSPM_UPD *const mupd) {
Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47849
to look at the new patch set (#4).
Change subject: mb/kontron/bsl6: Use include folder for header files ......................................................................
mb/kontron/bsl6: Use include folder for header files
Change-Id: Id73a7385f7701920efebaa3e293ac50a6ba93272 Signed-off-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/kontron/bsl6/Makefile.inc R src/mainboard/kontron/bsl6/include/mainboard/gpio.h R src/mainboard/kontron/bsl6/include/variant.h M src/mainboard/kontron/bsl6/ramstage.c M src/mainboard/kontron/bsl6/romstage.c M src/mainboard/kontron/bsl6/variants/boxer26/romstage.c M src/mainboard/kontron/bsl6/variants/bsl6/romstage.c 7 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/47849/4
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47849 )
Change subject: mb/kontron/bsl6: Use include folder for header files ......................................................................
Patch Set 4: Code-Review+2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47849 )
Change subject: mb/kontron/bsl6: Use include folder for header files ......................................................................
Patch Set 4: Code-Review+2
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47849 )
Change subject: mb/kontron/bsl6: Use include folder for header files ......................................................................
mb/kontron/bsl6: Use include folder for header files
Change-Id: Id73a7385f7701920efebaa3e293ac50a6ba93272 Signed-off-by: Felix Singer felixsinger@posteo.net Reviewed-on: https://review.coreboot.org/c/coreboot/+/47849 Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Michael Niewöhner foss@mniewoehner.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/kontron/bsl6/Makefile.inc R src/mainboard/kontron/bsl6/include/mainboard/gpio.h R src/mainboard/kontron/bsl6/include/variant.h M src/mainboard/kontron/bsl6/ramstage.c M src/mainboard/kontron/bsl6/romstage.c M src/mainboard/kontron/bsl6/variants/boxer26/romstage.c M src/mainboard/kontron/bsl6/variants/bsl6/romstage.c 7 files changed, 6 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Michael Niewöhner: Looks good to me, approved
diff --git a/src/mainboard/kontron/bsl6/Makefile.inc b/src/mainboard/kontron/bsl6/Makefile.inc index 1e12ee4..49c9a6c 100644 --- a/src/mainboard/kontron/bsl6/Makefile.inc +++ b/src/mainboard/kontron/bsl6/Makefile.inc @@ -1,5 +1,7 @@ ## SPDX-License-Identifier: GPL-2.0-only
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include + bootblock-y += bootblock.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c diff --git a/src/mainboard/kontron/bsl6/gpio.h b/src/mainboard/kontron/bsl6/include/mainboard/gpio.h similarity index 100% rename from src/mainboard/kontron/bsl6/gpio.h rename to src/mainboard/kontron/bsl6/include/mainboard/gpio.h diff --git a/src/mainboard/kontron/bsl6/variant.h b/src/mainboard/kontron/bsl6/include/variant.h similarity index 100% rename from src/mainboard/kontron/bsl6/variant.h rename to src/mainboard/kontron/bsl6/include/variant.h diff --git a/src/mainboard/kontron/bsl6/ramstage.c b/src/mainboard/kontron/bsl6/ramstage.c index 2664a4f..b26c62f 100644 --- a/src/mainboard/kontron/bsl6/ramstage.c +++ b/src/mainboard/kontron/bsl6/ramstage.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/ramstage.h> -#include "gpio.h" +#include <mainboard/gpio.h>
void mainboard_silicon_init_params(FSP_SIL_UPD *params) { diff --git a/src/mainboard/kontron/bsl6/romstage.c b/src/mainboard/kontron/bsl6/romstage.c index 9d9169c..0cb7b06 100644 --- a/src/mainboard/kontron/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/romstage.c @@ -8,8 +8,7 @@ #include <soc/romstage.h> #include <fsp/soc_binding.h> #include <pc80/mc146818rtc.h> - -#include "variant.h" +#include <variant.h>
/* Rcomp resistor */ static const u16 rcomp_resistors[3] = { 121, 75, 100 }; diff --git a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c index 9c14d84..f1409e0 100644 --- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c @@ -5,8 +5,7 @@ #include <console/console.h> #include <pc80/mc146818rtc.h> #include <fsp/soc_binding.h> - -#include "../../variant.h" +#include <variant.h>
void variant_memory_init_params(FSPM_UPD *const mupd) { diff --git a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c index 8b32bf5..c9122c1 100644 --- a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <fsp/soc_binding.h> - -#include "../../variant.h" +#include <variant.h>
void variant_memory_init_params(FSPM_UPD *const mupd) {