The applications were moved to board/arch subdirectory, so these extra checks in Makfile.omk are redundant now. --- arch/arm/mach-lpc13xx/test/ahoy1311/Makefile.omk | 6 ------ arch/arm/mach-lpc21xx/test/armtest_leds/Makefile.omk | 14 -------------- arch/arm/mach-lpc21xx/test/canldtg/Makefile.omk | 10 ---------- arch/arm/mach-lpc21xx/test/interrupt_t0_test/Makefile.omk | 16 ---------------- arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/Makefile.omk | 10 ---------- arch/arm/mach-lpc21xx/test/test_uart/Makefile.omk | 13 ------------- arch/arm/mach-lpc23xx/test/ahoy2364/Makefile.omk | 6 ------ board/arm/lpc17cmsis-mbed/test/mbed_blink/Makefile.omk | 16 ---------------- board/arm/lpceurobot/app/minibee/Makefile.omk | 11 ----------- board/arm/lpceurobot/libs/eb_ebb/Makefile.omk | 24 +++++++----------------- board/arm/lpceurobot/test/eb_blink/Makefile.omk | 10 ---------- board/arm/spejblarm/app/shodiny/Makefile.omk | 11 ----------- board/arm/spejblarm/app/smotor/Makefile.omk | 10 ---------- 13 files changed, 7 insertions(+), 150 deletions(-) diff --git a/arch/arm/mach-lpc13xx/test/ahoy1311/Makefile.omk b/arch/arm/mach-lpc13xx/test/ahoy1311/Makefile.omk index bcb90da..c82d980 100644 --- a/arch/arm/mach-lpc13xx/test/ahoy1311/Makefile.omk +++ b/arch/arm/mach-lpc13xx/test/ahoy1311/Makefile.omk @@ -1,14 +1,8 @@ # -*- makefile -*- -ifeq ($(MACH),lpc13xx) bin_PROGRAMS = ahoy1311 ahoy1311_SOURCES = ahoy.c ahoy1311_LIBS = uart_zen link_VARIANTS = ram flash -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) - $(error This works only with LPC13xx machnies!) -endif -endif diff --git a/arch/arm/mach-lpc21xx/test/armtest_leds/Makefile.omk b/arch/arm/mach-lpc21xx/test/armtest_leds/Makefile.omk index 32d892e..546c779 100644 --- a/arch/arm/mach-lpc21xx/test/armtest_leds/Makefile.omk +++ b/arch/arm/mach-lpc21xx/test/armtest_leds/Makefile.omk @@ -1,17 +1,3 @@ # -*- makefile -*- - -MY_MACH = lpc21xx -ifeq ($(MACH), $(MY_MACH)) - - -#za bin_programs se dava nazev programu bin_PROGRAMS = armtest_leds - -# za nazev_programu_SOURCES = se davaji vsechny c zdrojaky, ktere se maji prelozit, oddelovac je mezernik armtest_leds_SOURCES = main.c - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my mach - $(MY_MACH). Not going to compile!) -endif -endif \ No newline at end of file diff --git a/arch/arm/mach-lpc21xx/test/canldtg/Makefile.omk b/arch/arm/mach-lpc21xx/test/canldtg/Makefile.omk index d4ba6ac..ea355ab 100644 --- a/arch/arm/mach-lpc21xx/test/canldtg/Makefile.omk +++ b/arch/arm/mach-lpc21xx/test/canldtg/Makefile.omk @@ -1,8 +1,4 @@ # -*- makefile -*- - -MY_MACH = lpc21xx -ifeq ($(MACH), $(MY_MACH)) - ifdef ID CFLAGS += -DCANLOAD_ID=$(ID) endif @@ -11,9 +7,3 @@ link_VARIANTS = canld bin_PROGRAMS = canldtg canldtg_LIBS = can canldtg_SOURCES = canld_tg.c - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my mach - $(MY_MACH). Not going to compile!) -endif -endif \ No newline at end of file diff --git a/arch/arm/mach-lpc21xx/test/interrupt_t0_test/Makefile.omk b/arch/arm/mach-lpc21xx/test/interrupt_t0_test/Makefile.omk index 04b587b..e19eb4b 100644 --- a/arch/arm/mach-lpc21xx/test/interrupt_t0_test/Makefile.omk +++ b/arch/arm/mach-lpc21xx/test/interrupt_t0_test/Makefile.omk @@ -1,20 +1,4 @@ # -*- makefile -*- - -MY_MACH = lpc21xx -ifeq ($(MACH), $(MY_MACH)) - - - bin_PROGRAMS = interrupt_t0_test interrupt_t0_test_SOURCES = interrupt_t0_test.c - -# Switch off compiler optimization and debug info. -#OPTIMIZE= -#DEBUG= - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my mach - $(MY_MACH). Not going to compile!) -endif -endif diff --git a/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/Makefile.omk b/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/Makefile.omk index 6e886ab..0de68ae 100644 --- a/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/Makefile.omk +++ b/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/Makefile.omk @@ -1,17 +1,7 @@ # -*- makefile -*- - -MY_MACH = lpc21xx -ifeq ($(MACH), $(MY_MACH)) - bin_PROGRAMS = test_ARMBoard_pwm test_ARMBoard_pwm_SOURCES = test_ARMBoard_pwm.c pwm.c #test_LIBS = boot_fn #link_VARIANTS = boot ram bload flash - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my mach - $(MY_MACH). Not going to compile!) -endif -endif \ No newline at end of file diff --git a/arch/arm/mach-lpc21xx/test/test_uart/Makefile.omk b/arch/arm/mach-lpc21xx/test/test_uart/Makefile.omk index e52e6f1..93b040a 100644 --- a/arch/arm/mach-lpc21xx/test/test_uart/Makefile.omk +++ b/arch/arm/mach-lpc21xx/test/test_uart/Makefile.omk @@ -1,18 +1,5 @@ # -*- makefile -*- -MY_MACH = lpc21xx -ifeq ($(MACH), $(MY_MACH)) - bin_PROGRAMS = test_uart test_uart_SOURCES = uart_test.c uartx.c - -# Switch off compiler optimization and debug info. -#OPTIMIZE= -#DEBUG= - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my mach - $(MY_MACH). Not going to compile!) -endif -endif \ No newline at end of file diff --git a/arch/arm/mach-lpc23xx/test/ahoy2364/Makefile.omk b/arch/arm/mach-lpc23xx/test/ahoy2364/Makefile.omk index 69a82ef..95c2b69 100644 --- a/arch/arm/mach-lpc23xx/test/ahoy2364/Makefile.omk +++ b/arch/arm/mach-lpc23xx/test/ahoy2364/Makefile.omk @@ -1,14 +1,8 @@ # -*- makefile -*- -ifeq ($(MACH),lpc23xx) bin_PROGRAMS = ahoy2364 ahoy2364_SOURCES = ahoy2364.c ahoy2364_LIBS = pwm pll uart_zen link_VARIANTS = ram -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) - $(error This works only with LPC23xx machnies!) -endif -endif diff --git a/board/arm/lpc17cmsis-mbed/test/mbed_blink/Makefile.omk b/board/arm/lpc17cmsis-mbed/test/mbed_blink/Makefile.omk index bfd461b..83e3181 100644 --- a/board/arm/lpc17cmsis-mbed/test/mbed_blink/Makefile.omk +++ b/board/arm/lpc17cmsis-mbed/test/mbed_blink/Makefile.omk @@ -1,19 +1,3 @@ # -*- makefile -*- -MY_BOARD = lpc17cmsis-mbed -ifeq ($(BOARD), $(MY_BOARD)) - - -# eb_blink je nazev programu, pod timto navzem bude systemem prekladan bin_PROGRAMS = mbed_blink - - -# za nazev_programu_SOURCES se davaji vsechny C zdrojaky, ktere se budou kompilovat mbed_blink_SOURCES = main.c - - - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my board - $(MY_BOARD). Not going to compile!) -endif -endif diff --git a/board/arm/lpceurobot/app/minibee/Makefile.omk b/board/arm/lpceurobot/app/minibee/Makefile.omk index cfab0d6..90b9fdd 100644 --- a/board/arm/lpceurobot/app/minibee/Makefile.omk +++ b/board/arm/lpceurobot/app/minibee/Makefile.omk @@ -1,9 +1,4 @@ # -*- makefile -*- - -MY_BOARD = lpceurobot -ifeq ($(BOARD), $(MY_BOARD)) - - # eb_blink je nazev programu, pod timto navzem bude systemem prekladan bin_PROGRAMS = minibee @@ -13,9 +8,3 @@ minibee_SOURCES = main.c spi_LPC.c MC1319x.c uart_minibee.c minibee_LIBS = ebb - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my board - $(MY_BOARD). Not going to compile!) -endif -endif diff --git a/board/arm/lpceurobot/libs/eb_ebb/Makefile.omk b/board/arm/lpceurobot/libs/eb_ebb/Makefile.omk index 305582e..f4eaf58 100644 --- a/board/arm/lpceurobot/libs/eb_ebb/Makefile.omk +++ b/board/arm/lpceurobot/libs/eb_ebb/Makefile.omk @@ -1,23 +1,13 @@ # -*- makefile -*- +bin_PROGRAMS = eb_ebb -MY_BOARD = lpceurobot -ifeq ($(BOARD), $(MY_BOARD)) +eb_ebb_SOURCES = main.c +eb_ebb_LIBS = can ebb - bin_PROGRAMS = eb_ebb - eb_ebb_SOURCES = main.c - eb_ebb_LIBS = can ebb +lib_LIBRARIES = ebb +ebb_SOURCES = powswitch.c uart.c servo.c engine.c adc.c adc_filtr.c +include_HEADERS = engine.h powswitch.h servo.h uart.h adc.h adc_filtr.h - lib_LIBRARIES = ebb - ebb_SOURCES = powswitch.c uart.c servo.c engine.c adc.c adc_filtr.c - - include_HEADERS = engine.h powswitch.h servo.h uart.h adc.h adc_filtr.h - - link_VARIANTS = flash - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my board - $(MY_BOARD). Not going to compile!) -endif -endif +link_VARIANTS = flash diff --git a/board/arm/lpceurobot/test/eb_blink/Makefile.omk b/board/arm/lpceurobot/test/eb_blink/Makefile.omk index 8d99935..e395bd3 100644 --- a/board/arm/lpceurobot/test/eb_blink/Makefile.omk +++ b/board/arm/lpceurobot/test/eb_blink/Makefile.omk @@ -1,17 +1,7 @@ # -*- makefile -*- -MY_BOARD = lpceurobot -ifeq ($(BOARD), $(MY_BOARD)) - - # eb_blink je nazev programu, pod timto navzem bude systemem prekladan bin_PROGRAMS = eb_blink # za nazev_programu_SOURCES se davaji vsechny C zdrojaky, ktere se budou kompilovat eb_blink_SOURCES = main.c - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my board - $(MY_BOARD). Not going to compile!) -endif -endif diff --git a/board/arm/spejblarm/app/shodiny/Makefile.omk b/board/arm/spejblarm/app/shodiny/Makefile.omk index 2b21934..a6c4911 100644 --- a/board/arm/spejblarm/app/shodiny/Makefile.omk +++ b/board/arm/spejblarm/app/shodiny/Makefile.omk @@ -1,17 +1,6 @@ # -*- makefile -*- -MY_BOARD = spejblarm -ifeq ($(BOARD), $(MY_BOARD)) - - - bin_PROGRAMS = shodiny shodiny_SOURCES = hodiny.c shodiny_LIBS = can link_VARIANTS = mpram - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my board - $(MY_BOARD). Not going to compile!) -endif -endif \ No newline at end of file diff --git a/board/arm/spejblarm/app/smotor/Makefile.omk b/board/arm/spejblarm/app/smotor/Makefile.omk index 94cb2f1..d1224bc 100644 --- a/board/arm/spejblarm/app/smotor/Makefile.omk +++ b/board/arm/spejblarm/app/smotor/Makefile.omk @@ -1,15 +1,5 @@ # -*- makefile -*- -MY_BOARD = spejblarm -ifeq ($(BOARD), $(MY_BOARD)) - - bin_PROGRAMS = smotor smotor_SOURCES = motor.c pwm.c smotor_LIBS = can link_VARIANTS = mpram - -else -ifeq ($(RELATIVE_DIR),$(INVOCATION_DIR)) -$(error Not my board - $(MY_BOARD). Not going to compile!) -endif -endif -- 1.7.1.3.g75e44