[PATCH 1/2] scripts: socfpga: statify sys_mgr_init_table

[PATCH 1/2] scripts: socfpga: statify sys_mgr_init_table

[Steffen Trumtrar]

The preloader import-script misses the sys_mgr_init_table variable.
When multiple boards are build, this will lead to compile errors,
because the variable exists multiple times.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 scripts/socfpga_import_preloader | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/socfpga_import_preloader b/scripts/socfpga_import_preloader
index 9fc657e483e6..b08262cb6c83 100755
--- a/scripts/socfpga_import_preloader
+++ b/scripts/socfpga_import_preloader
@@ -29,6 +29,7 @@ copy_source() {
 	echo "	Fixing extern/static keywords..."
 	# Statify all global variables with missing static keyword
 	sed -i 's/^const /static const /g' $tgt
+	sed -i 's/^unsigned long sys_mgr_init_table/static unsigned long sys_mgr_init_table/g' $tgt
 
 	echo "	Remove unused defines..."
 	sed -i 's/\[CONFIG_HPS_PINMUX_NUM\]/\[\]/g' $tgt
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ARM: socfpga: socdk: statify sys_mgr_init_table

[Steffen Trumtrar]

The socdk can't be build in a multiboard environment, i.e. when other
socfgpa boards are also build.

Fix this.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/boards/altera-socdk/pinmux_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/altera-socdk/pinmux_config.c b/arch/arm/boards/altera-socdk/pinmux_config.c
index 0965e133792f..ff784bbecf93 100644
--- a/arch/arm/boards/altera-socdk/pinmux_config.c
+++ b/arch/arm/boards/altera-socdk/pinmux_config.c
@@ -30,7 +30,7 @@
 #include <common.h>
 
 /* pin MUX configuration data */
-unsigned long sys_mgr_init_table[] = {
+static unsigned long sys_mgr_init_table[] = {
 	0,			/* EMACIO0 */
 	2,			/* EMACIO1 */
 	2,			/* EMACIO2 */
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] scripts: socfpga: statify sys_mgr_init_table

[Sascha Hauer]

On Thu, Mar 05, 2015 at 11:58:30AM +0100, Steffen Trumtrar wrote:
> The preloader import-script misses the sys_mgr_init_table variable.
> When multiple boards are build, this will lead to compile errors,
> because the variable exists multiple times.
> 
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  scripts/socfpga_import_preloader | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox