[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-490-g18b2b3d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-490-g18b2b3d
|
From: Sébastien S. <ss...@us...> - 2014-11-28 17:00:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 18b2b3d03ad63d29c4f7de2175013744bda1453a (commit)
via 907d78549545034d2f06dc3bc5884a9882efc6c6 (commit)
from 957ad91c4e6741b478d150c8d3cdbcc4f22bb345 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 18b2b3d03ad63d29c4f7de2175013744bda1453a
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Nov 28 18:02:13 2014 +0100
[BUILDROOT] Add ARMADEUS_TOOLCHAIN_PREFIX env var and make demos compile
locally again
commit 907d78549545034d2f06dc3bc5884a9882efc6c6
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Nov 21 17:19:37 2014 +0100
[BUILDROOT] Remove unused ARMADEUS_SDL_DIR and ARMADEUS_XENOMAI_DIR
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 --
Makefile.in | 20 +++-----------------
target/demos/armanoid/Makefile | 4 ++--
target/demos/backlight_control/Makefile | 4 ++--
target/demos/camera/capture/Makefile | 5 ++---
target/demos/gpio/Makefile | 4 ++--
target/demos/gps/Makefile | 4 ++--
target/demos/input_test/Makefile | 4 ++--
target/demos/mcp25020_ctrl/Makefile | 4 ++--
target/demos/music_player/Makefile | 4 ++--
target/demos/oscillo/Makefile | 5 ++++-
target/demos/real_time/Makefile.in | 16 ++++++++--------
target/demos/real_time/fractal/Makefile | 5 ++++-
target/demos/shm/Makefile | 4 ++--
target/demos/show_image/Makefile | 5 ++---
target/demos/test_lcd/Makefile | 4 ++--
target/demos/toggle_gpio/Makefile | 11 +++++------
target/linux/debug/fpgaregs/Makefile | 5 ++++-
target/linux/debug/imx-fpga-test/Makefile | 4 ++--
target/linux/debug/imxregs/Makefile | 6 +++++-
target/linux/debug/imxregs/README | 2 +-
target/linux/modules/Makefile.in | 2 +-
.../fpga/board_designs/wishbone_example/Makefile | 2 +-
.../wishbone_example/wb_button/Makefile | 2 +-
.../board_designs/wishbone_example/wb_led/Makefile | 2 +-
target/linux/modules/fpga/others/i2ctest/Makefile | 2 +-
.../linux/modules/fpga/others/ps2keyboard/README | 2 +-
.../fpga/virtual_components/button/Makefile | 2 +-
.../modules/fpga/virtual_components/led/Makefile | 2 +-
target/linux/modules/pwm/test/Makefile | 7 +++++--
target/packages/anybus-tools/Makefile | 4 ++--
target/packages/as_devices/Makefile | 4 ++--
target/packages/as_devices/c/Makefile | 2 +-
target/packages/as_devices/cpp/Makefile | 5 +----
target/packages/as_devices/python/Makefile | 6 +++---
target/packages/tfp410ctrl/Makefile | 4 +++-
target/packages/tfp410ctrl/README | 2 +-
37 files changed, 84 insertions(+), 88 deletions(-)
diff --git a/Makefile b/Makefile
index 23307b9..0fdf9b3 100644
--- a/Makefile
+++ b/Makefile
@@ -211,9 +211,7 @@ shell_env:
@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_STAGING_DIR=$(ARMADEUS_STAGING_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_SDL_DIR=$(ARMADEUS_SDL_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_GCC_VERSION=$(ARMADEUS_GCC_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LIBC_NAME=$(ARMADEUS_LIBC_NAME) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LIBC_VERSION=$(ARMADEUS_LIBC_VERSION) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index 2dc76fc..d33adfe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,18 +46,6 @@ ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_U_BOOT_BOARD_NAME:=$(shell echo $(BR2_TARGET_UBOOT_BOARDNAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
-ifeq ($(BR2_PACKAGE_SDL),y)
-ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/sdl.mk 2>/dev/null | cut -d = -f 2)
-else
-ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
-endif
-
-ifeq ($(BR2_PACKAGE_XENOMAI),y)
-ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
-else
-ARMADEUS_XENOMAI_VERSION:=XENOMAI_NOT_INSTALLED
-endif
-
ifeq ($(BR2_PACKAGE_QT),y)
ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
ARMADEUS_QT_VERSION_MAJOR:=$(shell grep "QT_VERSION_MAJOR =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d ' ' -f 3)
@@ -95,13 +83,11 @@ ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-gcc -dumpversion)
+ARMADEUS_TOOLCHAIN_PREFIX=$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-
else
-ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -dumpversion)
+ARMADEUS_TOOLCHAIN_PREFIX=arm-linux-
endif
+ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -dumpversion)
ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
-ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/sdl-$(ARMADEUS_SDL_VERSION)
-ARMADEUS_XENOMAI_DIR:=$(ARMADEUS_BUILD_DIR)/xenomai-$(ARMADEUS_XENOMAI_VERSION)
ARMADEUS_QT_DIR:=$(ARMADEUS_BUILD_DIR)/qt-$(ARMADEUS_QT_VERSION)
-
diff --git a/target/demos/armanoid/Makefile b/target/demos/armanoid/Makefile
index 34b18ed..610aec8 100644
--- a/target/demos/armanoid/Makefile
+++ b/target/demos/armanoid/Makefile
@@ -6,8 +6,8 @@ STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
diff --git a/target/demos/backlight_control/Makefile b/target/demos/backlight_control/Makefile
index 5977fba..3ac0bb4 100644
--- a/target/demos/backlight_control/Makefile
+++ b/target/demos/backlight_control/Makefile
@@ -4,8 +4,8 @@ ARMADEUS_BASE_DIR=../../..
# Default values for local compiling:
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-DTARGET
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
diff --git a/target/demos/camera/capture/Makefile b/target/demos/camera/capture/Makefile
index ea6152c..17b0efc 100644
--- a/target/demos/camera/capture/Makefile
+++ b/target/demos/camera/capture/Makefile
@@ -4,9 +4,8 @@ ARMADEUS_BASE_DIR=../../../..
# Default values for local compiling:
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags)
#CFLAGS+=-Wall -g
diff --git a/target/demos/gpio/Makefile b/target/demos/gpio/Makefile
index 14a8723..4c4a702 100644
--- a/target/demos/gpio/Makefile
+++ b/target/demos/gpio/Makefile
@@ -3,8 +3,8 @@ ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-D$(ARMADEUS_BOARD_NAME)
diff --git a/target/demos/gps/Makefile b/target/demos/gps/Makefile
index 58223b4..7c3deca 100644
--- a/target/demos/gps/Makefile
+++ b/target/demos/gps/Makefile
@@ -1,8 +1,8 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
CFLAGS+=-Wall -g
diff --git a/target/demos/input_test/Makefile b/target/demos/input_test/Makefile
index a81c4f5..8895ea1 100644
--- a/target/demos/input_test/Makefile
+++ b/target/demos/input_test/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --libs)
diff --git a/target/demos/mcp25020_ctrl/Makefile b/target/demos/mcp25020_ctrl/Makefile
index 1c35652..4884987 100644
--- a/target/demos/mcp25020_ctrl/Makefile
+++ b/target/demos/mcp25020_ctrl/Makefile
@@ -4,8 +4,8 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS= -Wall
diff --git a/target/demos/music_player/Makefile b/target/demos/music_player/Makefile
index c008e0e..0247d53 100755
--- a/target/demos/music_player/Makefile
+++ b/target/demos/music_player/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
# Default values
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-DAPF
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags) -g
diff --git a/target/demos/oscillo/Makefile b/target/demos/oscillo/Makefile
index 266fa0d..0adea6a 100644
--- a/target/demos/oscillo/Makefile
+++ b/target/demos/oscillo/Makefile
@@ -1,4 +1,7 @@
-CC=arm-linux-gcc
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS=-g -W -Wall
LDFLAGS=-lm
INSTALL_DIR=/tftpboot
diff --git a/target/demos/real_time/Makefile.in b/target/demos/real_time/Makefile.in
index 7f67bb7..e4e30a3 100644
--- a/target/demos/real_time/Makefile.in
+++ b/target/demos/real_time/Makefile.in
@@ -2,14 +2,14 @@
DEST_DIR=/tftpboot/local/bin
include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-LD:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ld
-CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-AS:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-as
-NM:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-nm
-AR:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ar
-SIZE:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-size
-OBJCOPY:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-objcopy
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+LD:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)ld
+CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
+AS:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)as
+NM:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)nm
+AR:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)ar
+SIZE:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)size
+OBJCOPY:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)objcopy
EXEC=$(APPLICATIONS)
diff --git a/target/demos/real_time/fractal/Makefile b/target/demos/real_time/fractal/Makefile
index e6c30d6..da27ce7 100644
--- a/target/demos/real_time/fractal/Makefile
+++ b/target/demos/real_time/fractal/Makefile
@@ -1,4 +1,7 @@
-CC=arm-linux-gcc
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS=-g -W -Wall
LDFLAGS=
EXEC=newton
diff --git a/target/demos/shm/Makefile b/target/demos/shm/Makefile
index e4a54af..c658d33 100644
--- a/target/demos/shm/Makefile
+++ b/target/demos/shm/Makefile
@@ -2,8 +2,8 @@
ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-D$(ARMADEUS_BOARD_NAME)
SHMWRITER = shmwriter
diff --git a/target/demos/show_image/Makefile b/target/demos/show_image/Makefile
index 012224d..6efd861 100644
--- a/target/demos/show_image/Makefile
+++ b/target/demos/show_image/Makefile
@@ -1,11 +1,10 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
DEFINES=-DTARGET
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags) -g
diff --git a/target/demos/test_lcd/Makefile b/target/demos/test_lcd/Makefile
index 24cdb37..c1be032 100644
--- a/target/demos/test_lcd/Makefile
+++ b/target/demos/test_lcd/Makefile
@@ -4,8 +4,8 @@ ARMADEUS_BASE_DIR=../../..
# Default values for local compiling:
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
diff --git a/target/demos/toggle_gpio/Makefile b/target/demos/toggle_gpio/Makefile
index c869b07..79869c5 100644
--- a/target/demos/toggle_gpio/Makefile
+++ b/target/demos/toggle_gpio/Makefile
@@ -1,11 +1,10 @@
-HOST_DIR = ../../../buildroot/output/host/
-STAGING_DIR = ../../../buildroot/output/staging/
-TARGET_DIR = ../../../buildroot/output/target/
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC = $(HOST_DIR)/usr/bin/arm-linux-gcc
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS = -Wall
-INCLUDE = -I$(STAGING_DIR)/usr/include/as_devices/
-INSTALL_DIR = $(TARGET_DIR)/usr/bin/
+INCLUDE = -I$(ARMADEUS_STAGING_DIR)/usr/include/as_devices/
+INSTALL_DIR = $(ARMADEUS_ROOTFS_DIR)/usr/bin/
EXEC = toggle_gpio
diff --git a/target/linux/debug/fpgaregs/Makefile b/target/linux/debug/fpgaregs/Makefile
index ecff1f4..3e836ea 100644
--- a/target/linux/debug/fpgaregs/Makefile
+++ b/target/linux/debug/fpgaregs/Makefile
@@ -1,5 +1,8 @@
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
ifeq ($(CC),cc)
- CC=arm-linux-gcc
+ CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
endif
all: fpgaregs fpga27regs fpga51regs
diff --git a/target/linux/debug/imx-fpga-test/Makefile b/target/linux/debug/imx-fpga-test/Makefile
index 588d3a8..b52b50e 100644
--- a/target/linux/debug/imx-fpga-test/Makefile
+++ b/target/linux/debug/imx-fpga-test/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR=../../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS=-Wall -g -O0
diff --git a/target/linux/debug/imxregs/Makefile b/target/linux/debug/imxregs/Makefile
index 1ffa7e7..7ddb6f0 100644
--- a/target/linux/debug/imxregs/Makefile
+++ b/target/linux/debug/imxregs/Makefile
@@ -1,4 +1,8 @@
-CC = arm-linux-gcc
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
EXECS = imxlregs imx27regs imx28regs imx51regs imx53regs
all: $(EXECS)
diff --git a/target/linux/debug/imxregs/README b/target/linux/debug/imxregs/README
index 9def549..b82269e 100644
--- a/target/linux/debug/imxregs/README
+++ b/target/linux/debug/imxregs/README
@@ -1,3 +1,3 @@
To compile:
- $ make CC=../../../../buildroot/build_arm/staging_dir/bin/arm-linux-gcc
+ $ make
diff --git a/target/linux/modules/Makefile.in b/target/linux/modules/Makefile.in
index 0403e3b..ae6e445 100755
--- a/target/linux/modules/Makefile.in
+++ b/target/linux/modules/Makefile.in
@@ -3,7 +3,7 @@
#
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) ARCH=arm CROSS_COMPILE=$(PWD)/$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux- modules
+ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) ARCH=arm CROSS_COMPILE=$(PWD)/$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX) modules
clean:
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index fc0d58e..6217433 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -20,6 +20,6 @@ install:
$(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc push-led.c -o push-led
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc push-led.c -o push-led
endif
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
index 99f158c..80b9b16 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
@@ -15,7 +15,7 @@ KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testbutton.c -o testbutton
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc testbutton.c -o testbutton
endif
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
index 103956b..487dab0 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
@@ -16,7 +16,7 @@ KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -Wall testled.c -o testled
chmod 755 testled
endif
diff --git a/target/linux/modules/fpga/others/i2ctest/Makefile b/target/linux/modules/fpga/others/i2ctest/Makefile
index a4e7343..0d92d25 100755
--- a/target/linux/modules/fpga/others/i2ctest/Makefile
+++ b/target/linux/modules/fpga/others/i2ctest/Makefile
@@ -23,7 +23,7 @@ PWD := $(shell pwd)
include ../../../Makefile.in
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testi2ctest.c -o testi2ctest
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc testi2ctest.c -o testi2ctest
chmod 755 testi2ctest
cp testi2ctest /tftpboot/
diff --git a/target/linux/modules/fpga/others/ps2keyboard/README b/target/linux/modules/fpga/others/ps2keyboard/README
index 6ea8680..9012bcb 100644
--- a/target/linux/modules/fpga/others/ps2keyboard/README
+++ b/target/linux/modules/fpga/others/ps2keyboard/README
@@ -1,6 +1,6 @@
To compile this driver (example):
---------------------------------
- make ARCH=arm CROSS_COMPILE=/local/julien/Armadeus/Armadeus_SVN_test/armadeus/software/buildroot/build_arm_nofpu/staging_dir/bin/arm-linux-
+ make
To install this driver:
-----------------------
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index a01141b..50c1a63 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -15,7 +15,7 @@ else
ARMADEUS_BASE_DIR=../../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
index e8ac2e1..f2baf1f 100644
--- a/target/linux/modules/fpga/virtual_components/led/Makefile
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -12,7 +12,7 @@ KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -Wall testled.c -o testled
chmod 755 testled
diff --git a/target/linux/modules/pwm/test/Makefile b/target/linux/modules/pwm/test/Makefile
index e88f037..3ac36f5 100755
--- a/target/linux/modules/pwm/test/Makefile
+++ b/target/linux/modules/pwm/test/Makefile
@@ -1,14 +1,17 @@
+ARMADEUS_BASE_DIR=../../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
OUTPUT = .
all: testtonemode testplaymode
testtonemode: testtonemode.c PWM_def.h MX1_def.h
- arm-linux-gcc -o $@ $<
+ $(CC) -o $@ $<
testplaymode: testplaymode.c PWM_def.h MX1_def.h
- arm-linux-gcc -o $@ $<
+ $(CC) -o $@ $<
clean:
rm -f testtonemode testplaymode
diff --git a/target/packages/anybus-tools/Makefile b/target/packages/anybus-tools/Makefile
index 3a5cfb4..1c1dbeb 100644
--- a/target/packages/anybus-tools/Makefile
+++ b/target/packages/anybus-tools/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
INITD_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS= -W -Wall -g
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 471744d..f4248d1 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -3,8 +3,8 @@ ARMADEUS_BASE_DIR = ../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS = -Wall -g -O0
LDFLAGS=
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
INSTALL_DIR = $(ARMADEUS_STAGING_DIR)
C_BINARY = test_cdevices
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 989b7a5..2e373d3 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -3,7 +3,7 @@ ARMADEUS_BASE_DIR = ../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS ?= -Wall -g -O0
LDFLAGS =
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
OBJ += as_pwm.o
OBJ += as_i2c.o
diff --git a/target/packages/as_devices/cpp/Makefile b/target/packages/as_devices/cpp/Makefile
index 59e2d4c..542918b 100644
--- a/target/packages/as_devices/cpp/Makefile
+++ b/target/packages/as_devices/cpp/Makefile
@@ -1,10 +1,7 @@
-# to compile for arm :
-# make CXX=../../../buildroot/build_armv5te/staging_dir/usr/bin/arm-linux-g++
-#
# Default values for local compiling:
ARMADEUS_BASE_DIR = ../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
CXXFLAGS =-Wall -g -O0
OBJS = as_i2c.o
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index ced0a44..1171e6b 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -5,9 +5,9 @@ ARMADEUS_BASE_DIR = ../../../../
CFLAGS = -Wall -g -O0
LDFLAGS =
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-STRIP = $(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
+STRIP = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
INCLUDE_LIB = ../c/
diff --git a/target/packages/tfp410ctrl/Makefile b/target/packages/tfp410ctrl/Makefile
index b811fd5..3b814ec 100644
--- a/target/packages/tfp410ctrl/Makefile
+++ b/target/packages/tfp410ctrl/Makefile
@@ -1,8 +1,10 @@
#
# Makefile for the APF51 HDMI/DVI controler (TFP410) utility
#
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC = arm-linux-gcc
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS = -Wall -O
INCLUDES =
diff --git a/target/packages/tfp410ctrl/README b/target/packages/tfp410ctrl/README
index 3d9604b..adfc196 100644
--- a/target/packages/tfp410ctrl/README
+++ b/target/packages/tfp410ctrl/README
@@ -1,4 +1,4 @@
* Compile parse_edid as standalone (PC):
$ make clean; make parse_edid CC=gcc CFLAGS=-DSTANDALONE
-* Cross-compile (ARM): be sure that arm-linux-gcc is in your PATH
+* Cross-compile (ARM):
$ make
hooks/post-receive
--
armadeus
|