* [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c
2014-09-30 22:40 [U-Boot] [PATCH 0/4] ARM: clean up declarations of public functions Eric Nelson
@ 2014-09-30 22:40 ` Eric Nelson
2014-10-11 10:52 ` Albert ARIBAUD
2014-10-21 8:50 ` Stefano Babic
2014-09-30 22:40 ` [U-Boot] [PATCH 2/4] ARM: i.MX6: include prototype for get_board_rev() Eric Nelson
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Eric Nelson @ 2014-09-30 22:40 UTC (permalink / raw)
To: u-boot
Without preceding declarations, "make C=1" generates
"Should it be static?" warnings for symbols
do_bootm_linux,
boot_prep_vxworks, and
boot_jump_vxworks
Include of bootm.h also identified a signature mismatch
(const on argv[]).
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
arch/arm/lib/bootm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 39fe7a1..4949d57 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -22,6 +22,8 @@
#include <asm/bootm.h>
#include <asm/secure.h>
#include <linux/compiler.h>
+#include <bootm.h>
+#include <vxworks.h>
#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
#include <asm/armv7.h>
@@ -299,7 +301,8 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
* DIFFERENCE: Instead of calling prep and go at the end
* they are called if subcommand is equal 0.
*/
-int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char * const argv[],
+ bootm_headers_t *images)
{
/* No need for those on ARM */
if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE)
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c
2014-09-30 22:40 ` [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c Eric Nelson
@ 2014-10-11 10:52 ` Albert ARIBAUD
2014-10-21 8:50 ` Stefano Babic
1 sibling, 0 replies; 12+ messages in thread
From: Albert ARIBAUD @ 2014-10-11 10:52 UTC (permalink / raw)
To: u-boot
Hi Eric,
On Tue, 30 Sep 2014 15:40:01 -0700, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:
> Without preceding declarations, "make C=1" generates
> "Should it be static?" warnings for symbols
> do_bootm_linux,
> boot_prep_vxworks, and
> boot_jump_vxworks
>
> Include of bootm.h also identified a signature mismatch
> (const on argv[]).
>
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
> arch/arm/lib/bootm.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 39fe7a1..4949d57 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -22,6 +22,8 @@
> #include <asm/bootm.h>
> #include <asm/secure.h>
> #include <linux/compiler.h>
> +#include <bootm.h>
> +#include <vxworks.h>
>
> #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
> #include <asm/armv7.h>
> @@ -299,7 +301,8 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
> * DIFFERENCE: Instead of calling prep and go at the end
> * they are called if subcommand is equal 0.
> */
> -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
> +int do_bootm_linux(int flag, int argc, char * const argv[],
> + bootm_headers_t *images)
> {
> /* No need for those on ARM */
> if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE)
Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c
2014-09-30 22:40 ` [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c Eric Nelson
2014-10-11 10:52 ` Albert ARIBAUD
@ 2014-10-21 8:50 ` Stefano Babic
1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-10-21 8:50 UTC (permalink / raw)
To: u-boot
Hi Eric,
On 01/10/2014 00:40, Eric Nelson wrote:
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 2/4] ARM: i.MX6: include prototype for get_board_rev()
2014-09-30 22:40 [U-Boot] [PATCH 0/4] ARM: clean up declarations of public functions Eric Nelson
2014-09-30 22:40 ` [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c Eric Nelson
@ 2014-09-30 22:40 ` Eric Nelson
2014-10-21 8:50 ` Stefano Babic
2014-09-30 22:40 ` [U-Boot] [PATCH 3/4] ARM: i.MX: provide declaration for board_spi_cs_gpio Eric Nelson
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Eric Nelson @ 2014-09-30 22:40 UTC (permalink / raw)
To: u-boot
Include <asm/bootm.h> to see the prototype for get_board_rev()
and prevent warning "Should it be static?" with "make C=1".
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
arch/arm/cpu/armv7/mx6/soc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index ba21cfe..f459d2f 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -20,6 +20,7 @@
#include <stdbool.h>
#include <asm/arch/mxc_hdmi.h>
#include <asm/arch/crm_regs.h>
+#include <asm/bootm.h>
enum ldo_reg {
LDO_ARM,
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 2/4] ARM: i.MX6: include prototype for get_board_rev()
2014-09-30 22:40 ` [U-Boot] [PATCH 2/4] ARM: i.MX6: include prototype for get_board_rev() Eric Nelson
@ 2014-10-21 8:50 ` Stefano Babic
0 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-10-21 8:50 UTC (permalink / raw)
To: u-boot
On 01/10/2014 00:40, Eric Nelson wrote:
> Include <asm/bootm.h> to see the prototype for get_board_rev()
> and prevent warning "Should it be static?" with "make C=1".
>
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 3/4] ARM: i.MX: provide declaration for board_spi_cs_gpio
2014-09-30 22:40 [U-Boot] [PATCH 0/4] ARM: clean up declarations of public functions Eric Nelson
2014-09-30 22:40 ` [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c Eric Nelson
2014-09-30 22:40 ` [U-Boot] [PATCH 2/4] ARM: i.MX6: include prototype for get_board_rev() Eric Nelson
@ 2014-09-30 22:40 ` Eric Nelson
2014-10-21 8:51 ` Stefano Babic
2014-09-30 22:40 ` [U-Boot] [PATCH 4/4] ARM: i.MX video: declare displays and display_count publicly Eric Nelson
2014-09-30 23:01 ` [U-Boot] [PATCH] stdio: staticize locally-used call-backs Eric Nelson
4 siblings, 1 reply; 12+ messages in thread
From: Eric Nelson @ 2014-09-30 22:40 UTC (permalink / raw)
To: u-boot
Provide a public declaration of the board_spi_cs_gpio()
callback for i.MX SPI chip selects to prevent the warning
"Should it be static?" when compiling with "make C=1".
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
arch/arm/include/asm/imx-common/spi.h | 17 +++++++++++++++++
board/boundary/nitrogen6x/nitrogen6x.c | 1 +
board/compulab/cm_fx6/common.c | 1 +
board/embest/mx6boards/mx6boards.c | 1 +
board/freescale/mx6qsabreauto/mx6qsabreauto.c | 1 +
board/freescale/mx6slevk/mx6slevk.c | 1 +
board/gateworks/gw_ventana/gw_ventana.c | 1 +
board/genesi/mx51_efikamx/efikamx.c | 1 +
board/ttcontrol/vision2/vision2.c | 1 +
drivers/spi/mxc_spi.c | 1 +
10 files changed, 26 insertions(+)
create mode 100644 arch/arm/include/asm/imx-common/spi.h
diff --git a/arch/arm/include/asm/imx-common/spi.h b/arch/arm/include/asm/imx-common/spi.h
new file mode 100644
index 0000000..1d4473a
--- /dev/null
+++ b/arch/arm/include/asm/imx-common/spi.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __MXC_SPI_H_
+#define __MXC_SPI_H_
+
+/*
+ * Board-level chip-select callback
+ * Should return GPIO # to be used for chip-select
+ */
+
+int board_spi_cs_gpio(unsigned bus, unsigned cs);
+
+#endif
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 7edfe19..b6a55f6 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -18,6 +18,7 @@
#include <asm/imx-common/iomux-v3.h>
#include <asm/imx-common/mxc_i2c.h>
#include <asm/imx-common/sata.h>
+#include <asm/imx-common/spi.h>
#include <asm/imx-common/boot_mode.h>
#include <asm/imx-common/video.h>
#include <mmc.h>
diff --git a/board/compulab/cm_fx6/common.c b/board/compulab/cm_fx6/common.c
index 1f39679..59c9d1a 100644
--- a/board/compulab/cm_fx6/common.c
+++ b/board/compulab/cm_fx6/common.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
+#include <asm/imx-common/spi.h>
#include <fsl_esdhc.h>
#include "common.h"
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index a725f15..02fb3fa 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -23,6 +23,7 @@
#include <asm/imx-common/iomux-v3.h>
#include <asm/imx-common/boot_mode.h>
#include <asm/imx-common/mxc_i2c.h>
+#include <asm/imx-common/spi.h>
#include <asm/imx-common/video.h>
#include <i2c.h>
#include <mmc.h>
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
index 836d722..6c676fe 100644
--- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
+++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
@@ -17,6 +17,7 @@
#include <asm/imx-common/iomux-v3.h>
#include <asm/imx-common/mxc_i2c.h>
#include <asm/imx-common/boot_mode.h>
+#include <asm/imx-common/spi.h>
#include <mmc.h>
#include <fsl_esdhc.h>
#include <miiphy.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index a0832f4..a500133 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -13,6 +13,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
#include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/spi.h>
#include <asm/io.h>
#include <linux/sizes.h>
#include <common.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 1038d9d..df491a8 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -20,6 +20,7 @@
#include <asm/imx-common/mxc_i2c.h>
#include <asm/imx-common/boot_mode.h>
#include <asm/imx-common/sata.h>
+#include <asm/imx-common/spi.h>
#include <asm/imx-common/video.h>
#include <jffs2/load_kernel.h>
#include <hwconfig.h>
diff --git a/board/genesi/mx51_efikamx/efikamx.c b/board/genesi/mx51_efikamx/efikamx.c
index 137e4ed..6ba55cd 100644
--- a/board/genesi/mx51_efikamx/efikamx.c
+++ b/board/genesi/mx51_efikamx/efikamx.c
@@ -14,6 +14,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
+#include <asm/imx-common/spi.h>
#include <i2c.h>
#include <mmc.h>
#include <fsl_esdhc.h>
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c
index b5249e7..247991d 100644
--- a/board/ttcontrol/vision2/vision2.c
+++ b/board/ttcontrol/vision2/vision2.c
@@ -15,6 +15,7 @@
#include <asm/arch/iomux-mx51.h>
#include <asm/gpio.h>
#include <asm/arch/sys_proto.h>
+#include <asm/imx-common/spi.h>
#include <i2c.h>
#include <mmc.h>
#include <power/pmic.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 026f680..be10269 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -12,6 +12,7 @@
#include <asm/gpio.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
+#include <asm/imx-common/spi.h>
#ifdef CONFIG_MX27
/* i.MX27 has a completely wrong register layout and register definitions in the
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 3/4] ARM: i.MX: provide declaration for board_spi_cs_gpio
2014-09-30 22:40 ` [U-Boot] [PATCH 3/4] ARM: i.MX: provide declaration for board_spi_cs_gpio Eric Nelson
@ 2014-10-21 8:51 ` Stefano Babic
0 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-10-21 8:51 UTC (permalink / raw)
To: u-boot
On 01/10/2014 00:40, Eric Nelson wrote:
> Provide a public declaration of the board_spi_cs_gpio()
> callback for i.MX SPI chip selects to prevent the warning
> "Should it be static?" when compiling with "make C=1".
>
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 4/4] ARM: i.MX video: declare displays and display_count publicly
2014-09-30 22:40 [U-Boot] [PATCH 0/4] ARM: clean up declarations of public functions Eric Nelson
` (2 preceding siblings ...)
2014-09-30 22:40 ` [U-Boot] [PATCH 3/4] ARM: i.MX: provide declaration for board_spi_cs_gpio Eric Nelson
@ 2014-09-30 22:40 ` Eric Nelson
2014-10-21 8:51 ` Stefano Babic
2014-09-30 23:01 ` [U-Boot] [PATCH] stdio: staticize locally-used call-backs Eric Nelson
4 siblings, 1 reply; 12+ messages in thread
From: Eric Nelson @ 2014-09-30 22:40 UTC (permalink / raw)
To: u-boot
Declare displays[] and display_count in imx-common/video.h to
prevent "Should it be static?" messages when compiling board
files with "make C=1".
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
arch/arm/imx-common/video.c | 3 ---
arch/arm/include/asm/imx-common/video.h | 5 +++++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index 0121cd7..8651b80 100644
--- a/arch/arm/imx-common/video.c
+++ b/arch/arm/imx-common/video.c
@@ -6,9 +6,6 @@
#include <asm/errno.h>
#include <asm/imx-common/video.h>
-extern struct display_info_t const displays[];
-extern size_t display_count;
-
int board_video_skip(void)
{
int i;
diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h
index 2d94850..1a907d4 100644
--- a/arch/arm/include/asm/imx-common/video.h
+++ b/arch/arm/include/asm/imx-common/video.h
@@ -21,4 +21,9 @@ struct display_info_t {
extern int detect_hdmi(struct display_info_t const *dev);
#endif
+#ifdef CONFIG_IMX_VIDEO_SKIP
+extern struct display_info_t const displays[];
+extern size_t display_count;
+#endif
+
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 4/4] ARM: i.MX video: declare displays and display_count publicly
2014-09-30 22:40 ` [U-Boot] [PATCH 4/4] ARM: i.MX video: declare displays and display_count publicly Eric Nelson
@ 2014-10-21 8:51 ` Stefano Babic
0 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-10-21 8:51 UTC (permalink / raw)
To: u-boot
On 01/10/2014 00:40, Eric Nelson wrote:
> Declare displays[] and display_count in imx-common/video.h to
> prevent "Should it be static?" messages when compiling board
> files with "make C=1".
>
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH] stdio: staticize locally-used call-backs
2014-09-30 22:40 [U-Boot] [PATCH 0/4] ARM: clean up declarations of public functions Eric Nelson
` (3 preceding siblings ...)
2014-09-30 22:40 ` [U-Boot] [PATCH 4/4] ARM: i.MX video: declare displays and display_count publicly Eric Nelson
@ 2014-09-30 23:01 ` Eric Nelson
2014-10-27 22:19 ` [U-Boot] " Tom Rini
4 siblings, 1 reply; 12+ messages in thread
From: Eric Nelson @ 2014-09-30 23:01 UTC (permalink / raw)
To: u-boot
The various nulldev_x and stdio_serial_x calls are only used indirectly
through the nulldev and serial devices, so make them static and
prevent the dreaded "Should it be static?" warning with "make C=1".
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
common/stdio.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/stdio.c b/common/stdio.c
index c878103..523d859 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -36,39 +36,39 @@ char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
#ifdef CONFIG_SYS_DEVICE_NULLDEV
-void nulldev_putc(struct stdio_dev *dev, const char c)
+static void nulldev_putc(struct stdio_dev *dev, const char c)
{
/* nulldev is empty! */
}
-void nulldev_puts(struct stdio_dev *dev, const char *s)
+static void nulldev_puts(struct stdio_dev *dev, const char *s)
{
/* nulldev is empty! */
}
-int nulldev_input(struct stdio_dev *dev)
+static int nulldev_input(struct stdio_dev *dev)
{
/* nulldev is empty! */
return 0;
}
#endif
-void stdio_serial_putc(struct stdio_dev *dev, const char c)
+static void stdio_serial_putc(struct stdio_dev *dev, const char c)
{
serial_putc(c);
}
-void stdio_serial_puts(struct stdio_dev *dev, const char *s)
+static void stdio_serial_puts(struct stdio_dev *dev, const char *s)
{
serial_puts(s);
}
-int stdio_serial_getc(struct stdio_dev *dev)
+static int stdio_serial_getc(struct stdio_dev *dev)
{
return serial_getc();
}
-int stdio_serial_tstc(struct stdio_dev *dev)
+static int stdio_serial_tstc(struct stdio_dev *dev)
{
return serial_tstc();
}
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread