From 2a2522eb8d5b1d358e78f40888d96f34a00898c6 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Fri, 6 Mar 2015 21:22:01 +0100 Subject: [PATCH 1/4] images: move board variable to parent makefile A lot of the image makefiles define an equal board variable, which gives the impression that this variable is unique for this makefile. As those files aren't freestanding makefiles but get included into a parent makefile this is not actually true. Attempts to override this variable will not work reliable as make is picking up a random instance. Fix this confusion by moving this variable out of the individual makefiles. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- images/Makefile | 2 ++ images/Makefile.imx | 2 -- images/Makefile.mvebu | 2 -- images/Makefile.mxs | 1 - images/Makefile.rockchip | 2 -- images/Makefile.tegra | 2 -- 6 files changed, 2 insertions(+), 9 deletions(-) diff --git a/images/Makefile b/images/Makefile index f7e978cde..f40de7bc2 100644 --- a/images/Makefile +++ b/images/Makefile @@ -97,6 +97,8 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F)) $(Q)if [ -z $(FILE_$(@F)) ]; then echo "FILE_$(@F) empty!"; false; fi $(call if_changed,shipped) +board = $(srctree)/arch/$(ARCH)/boards + include $(srctree)/images/Makefile.am33xx include $(srctree)/images/Makefile.imx include $(srctree)/images/Makefile.mvebu diff --git a/images/Makefile.imx b/images/Makefile.imx index eacc76eaa..cc9fdfc78 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -7,8 +7,6 @@ $(obj)/%.imximg: $(obj)/% FORCE $(call if_changed,imx_image) -board = $(srctree)/arch/$(ARCH)/boards - # ----------------------- i.MX25 based boards --------------------------- pblx-$(CONFIG_MACH_TX25) += start_imx25_karo_tx25 FILE_barebox-karo-tx25.img = start_imx25_karo_tx25.pblx diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu index 5e90855d2..c3923e4ec 100644 --- a/images/Makefile.mvebu +++ b/images/Makefile.mvebu @@ -9,8 +9,6 @@ $(obj)/%.kwbimg: $(obj)/% FORCE $(obj)/%.kwbuartimg: $(obj)/% FORCE $(call if_changed,kwb_image) -board = $(srctree)/arch/$(ARCH)/boards - KWBOPTS = -c -d 0x1000000 -e 0x1000000 # ----------------------- Armada 370 based boards --------------------------- diff --git a/images/Makefile.mxs b/images/Makefile.mxs index 733f83bd1..c93fb571f 100644 --- a/images/Makefile.mxs +++ b/images/Makefile.mxs @@ -18,7 +18,6 @@ quiet_cmd_mxs_sd = MXS-SD $@ $(obj)/%.mxssd: $(obj)/% $(call if_changed,mxs_sd) -board = $(srctree)/arch/$(ARCH)/boards mxs23cfg = $(srctree)/arch/arm/mach-mxs/mxs23img.cfg mxs28cfg = $(srctree)/arch/arm/mach-mxs/mxs28img.cfg diff --git a/images/Makefile.rockchip b/images/Makefile.rockchip index 244443301..9715b9208 100644 --- a/images/Makefile.rockchip +++ b/images/Makefile.rockchip @@ -2,8 +2,6 @@ # barebox image generation Makefile for Rockchip images # -board = $(srctree)/arch/$(ARCH)/boards - pblx-$(CONFIG_MACH_RADXA_ROCK) += start_radxa_rock FILE_barebox-radxa-rock.img = start_radxa_rock.pblx image-$(CONFIG_MACH_RADXA_ROCK) += barebox-radxa-rock.img diff --git a/images/Makefile.tegra b/images/Makefile.tegra index 4f876e4b5..b5782ca8c 100644 --- a/images/Makefile.tegra +++ b/images/Makefile.tegra @@ -28,8 +28,6 @@ quiet_cmd_tegra124_image = T124IMG $@ $(obj)/%.t124img: $(obj)/% FORCE $(call if_changed,tegra124_image) -board = $(srctree)/arch/$(ARCH)/boards - # ----------------------- Tegra20 based boards --------------------------- pblx-$(CONFIG_MACH_TOSHIBA_AC100) += start_toshiba_ac100 FILE_barebox-tegra20-toshiba-ac100-usbloader.img = start_toshiba_ac100.pblx From a5b9eb1ceb91cb7c2616df41eaeb05960cd8f0d5 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Fri, 6 Mar 2015 21:22:02 +0100 Subject: [PATCH 2/4] images: fix Tegra out-of-tree build The BCTs are build objects and as such are located in the objtree instead of the srctree. Fix out-of-tree build by defining a variable which refers to the board directories in the objtree and use it for Tegra. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- images/Makefile | 1 + images/Makefile.tegra | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/images/Makefile b/images/Makefile index f40de7bc2..c01179081 100644 --- a/images/Makefile +++ b/images/Makefile @@ -98,6 +98,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F)) $(call if_changed,shipped) board = $(srctree)/arch/$(ARCH)/boards +objboard = $(objtree)/arch/$(ARCH)/boards include $(srctree)/images/Makefile.am33xx include $(srctree)/images/Makefile.imx diff --git a/images/Makefile.tegra b/images/Makefile.tegra index b5782ca8c..c1e0b2057 100644 --- a/images/Makefile.tegra +++ b/images/Makefile.tegra @@ -38,17 +38,17 @@ FILE_barebox-tegra20-toradex-colibri-t20-256-usbloader-iris.img = start_colibri_ image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-256-usbloader-iris.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_colibri_t20_256_hsmmc -BCT_start_colibri_t20_256_hsmmc.pblx.t20img = $(board)/toradex-colibri-t20/colibri-t20_256_hsmmc.bct +BCT_start_colibri_t20_256_hsmmc.pblx.t20img = $(objboard)/toradex-colibri-t20/colibri-t20_256_hsmmc.bct FILE_barebox-tegra20-toradex-colibri-t20-256-hsmmc-iris.img = start_colibri_t20_256_hsmmc.pblx.t20img image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-256-hsmmc-iris.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_colibri_t20_256_v11_nand -BCT_start_colibri_t20_256_v11_nand.pblx.t20img = $(board)/toradex-colibri-t20/colibri-t20_256_v11_nand.bct +BCT_start_colibri_t20_256_v11_nand.pblx.t20img = $(objboard)/toradex-colibri-t20/colibri-t20_256_v11_nand.bct FILE_barebox-tegra20-toradex-colibri-t20-256-v11-nand-iris.img = start_colibri_t20_256_v11_nand.pblx.t20img image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-256-v11-nand-iris.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_colibri_t20_256_v12_nand -BCT_start_colibri_t20_256_v12_nand.pblx.t20img = $(board)/toradex-colibri-t20/colibri-t20_256_v12_nand.bct +BCT_start_colibri_t20_256_v12_nand.pblx.t20img = $(objboard)/toradex-colibri-t20/colibri-t20_256_v12_nand.bct FILE_barebox-tegra20-toradex-colibri-t20-256-v12-nand-iris.img = start_colibri_t20_256_v12_nand.pblx.t20img image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-256-v12-nand-iris.img @@ -57,17 +57,17 @@ FILE_barebox-tegra20-toradex-colibri-t20-512-usbloader-iris.img = start_colibri_ image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-512-usbloader-iris.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_colibri_t20_512_hsmmc -BCT_start_colibri_t20_512_hsmmc.pblx.t20img = $(board)/toradex-colibri-t20/colibri-t20_512_hsmmc.bct +BCT_start_colibri_t20_512_hsmmc.pblx.t20img = $(objboard)/toradex-colibri-t20/colibri-t20_512_hsmmc.bct FILE_barebox-tegra20-toradex-colibri-t20-512-hsmmc-iris.img = start_colibri_t20_512_hsmmc.pblx.t20img image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-512-hsmmc-iris.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_colibri_t20_512_v11_nand -BCT_start_colibri_t20_512_v11_nand.pblx.t20img = $(board)/toradex-colibri-t20/colibri-t20_512_v11_nand.bct +BCT_start_colibri_t20_512_v11_nand.pblx.t20img = $(objboard)/toradex-colibri-t20/colibri-t20_512_v11_nand.bct FILE_barebox-tegra20-toradex-colibri-t20-512-v11-nand-iris.img = start_colibri_t20_512_v11_nand.pblx.t20img image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-512-v11-nand-iris.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_colibri_t20_512_v12_nand -BCT_start_colibri_t20_512_v12_nand.pblx.t20img = $(board)/toradex-colibri-t20/colibri-t20_512_v12_nand.bct +BCT_start_colibri_t20_512_v12_nand.pblx.t20img = $(objboard)/toradex-colibri-t20/colibri-t20_512_v12_nand.bct FILE_barebox-tegra20-toradex-colibri-t20-512-v12-nand-iris.img = start_colibri_t20_512_v12_nand.pblx.t20img image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-512-v12-nand-iris.img @@ -77,7 +77,7 @@ FILE_barebox-tegra30-nvidia-beaver-usbloader.img = start_nvidia_beaver.pblx image-$(CONFIG_MACH_NVIDIA_BEAVER) += barebox-tegra30-nvidia-beaver-usbloader.img pblx-$(CONFIG_MACH_NVIDIA_BEAVER) += start_nvidia_beaver -BCT_start_nvidia_beaver.pblx.t30img = $(board)/nvidia-beaver/beaver-2gb-emmc.bct +BCT_start_nvidia_beaver.pblx.t30img = $(objboard)/nvidia-beaver/beaver-2gb-emmc.bct FILE_barebox-tegra30-nvidia-beaver-emmc.img = start_nvidia_beaver.pblx.t30img image-$(CONFIG_MACH_NVIDIA_BEAVER) += barebox-tegra30-nvidia-beaver-emmc.img @@ -87,6 +87,6 @@ FILE_barebox-tegra124-nvidia-jetson-tk1-usbloader.img = start_nvidia_jetson.pblx image-$(CONFIG_MACH_NVIDIA_JETSON) += barebox-tegra124-nvidia-jetson-tk1-usbloader.img pblx-$(CONFIG_MACH_NVIDIA_JETSON) += start_nvidia_jetson -BCT_start_nvidia_jetson.pblx.t124img = $(board)/nvidia-jetson-tk1/jetson-tk1-2gb-emmc.bct +BCT_start_nvidia_jetson.pblx.t124img = $(objboard)/nvidia-jetson-tk1/jetson-tk1-2gb-emmc.bct FILE_barebox-tegra124-nvidia-jetson-tk1-emmc.img = start_nvidia_jetson.pblx.t124img image-$(CONFIG_MACH_NVIDIA_JETSON) += barebox-tegra124-nvidia-jetson-tk1-emmc.img From 7b6ede69739f46053dba3bf20837563c0fcd2c58 Mon Sep 17 00:00:00 2001 From: Antony Pavlov Date: Sun, 22 Mar 2015 21:38:27 +0300 Subject: [PATCH 3/4] toshiba_ac100: board.c: drop unused headers Signed-off-by: Antony Pavlov Signed-off-by: Sascha Hauer --- arch/arm/boards/toshiba-ac100/board.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/boards/toshiba-ac100/board.c b/arch/arm/boards/toshiba-ac100/board.c index 0cb955c15..fd470f18f 100644 --- a/arch/arm/boards/toshiba-ac100/board.c +++ b/arch/arm/boards/toshiba-ac100/board.c @@ -15,11 +15,7 @@ */ #include -#include -#include #include -#include -#include #include #include From 134f24615b134f69c680f960781ff3df16b9c722 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 31 Mar 2015 18:14:55 +0200 Subject: [PATCH 4/4] commands: dmesg: fi format security warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commands/dmesg.c: In function ‘do_dmesg’: commands/dmesg.c:71:3: warning: format not a string literal and no format arguments [-Wformat-security] Signed-off-by: Marc Kleine-Budde Signed-off-by: Sascha Hauer --- commands/dmesg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/dmesg.c b/commands/dmesg.c index b2bb334e2..510bc1659 100644 --- a/commands/dmesg.c +++ b/commands/dmesg.c @@ -68,7 +68,7 @@ static int do_dmesg(int argc, char *argv[]) *(buf + len) = '\n'; *(buf + len + 1) = 0; - pr_info(buf); + pr_info("%s", buf); free(buf);