]>
Commit | Line | Data |
---|---|---|
69ed15f0 JR |
1 | diff -Naurp configure.ac configure.ac |
2 | --- configure.ac 2013-03-15 12:07:15.000000000 +0530 | |
3 | +++ configure.ac 2013-03-15 12:29:03.000000000 +0530 | |
4 | @@ -1153,9 +1153,9 @@ CHECK_AVR_DEVICE(atxmega128a4u) | |
5 | AM_CONDITIONAL(HAS_atxmega128a4u, test "x$HAS_atxmega128a4u" = "xyes") | |
6 | ||
7 | ||
8 | -# avrtiny10 | |
9 | -CHECK_AVR_DEVICE(avrtiny10) | |
10 | -AM_CONDITIONAL(HAS_avrtiny10, test "x$HAS_avrtiny10" = "xyes") | |
11 | +# avrtiny | |
12 | +CHECK_AVR_DEVICE(avrtiny) | |
13 | +AM_CONDITIONAL(HAS_avrtiny, test "x$HAS_avrtiny" = "xyes") | |
14 | ||
15 | CHECK_AVR_DEVICE(attiny4) | |
16 | AM_CONDITIONAL(HAS_attiny4, test "x$HAS_attiny4" = "xyes") | |
17 | @@ -1541,15 +1541,15 @@ AC_CONFIG_FILES([ | |
18 | ]) | |
19 | ||
20 | ||
21 | -# avrtiny10 | |
22 | +# avrtiny | |
23 | AC_CONFIG_FILES([ | |
24 | - avr/lib/avrtiny10/Makefile | |
25 | - avr/lib/avrtiny10/attiny4/Makefile | |
26 | - avr/lib/avrtiny10/attiny5/Makefile | |
27 | - avr/lib/avrtiny10/attiny9/Makefile | |
28 | - avr/lib/avrtiny10/attiny10/Makefile | |
29 | - avr/lib/avrtiny10/attiny20/Makefile | |
30 | - avr/lib/avrtiny10/attiny40/Makefile | |
31 | + avr/lib/avrtiny/Makefile | |
32 | + avr/lib/avrtiny/attiny4/Makefile | |
33 | + avr/lib/avrtiny/attiny5/Makefile | |
34 | + avr/lib/avrtiny/attiny9/Makefile | |
35 | + avr/lib/avrtiny/attiny10/Makefile | |
36 | + avr/lib/avrtiny/attiny20/Makefile | |
37 | + avr/lib/avrtiny/attiny40/Makefile | |
38 | ]) | |
39 | ||
40 | ||
41 | diff -Naurp devtools/gen-avr-lib-tree.sh devtools/gen-avr-lib-tree.sh | |
42 | --- devtools/gen-avr-lib-tree.sh 2013-03-15 12:07:15.000000000 +0530 | |
43 | +++ devtools/gen-avr-lib-tree.sh 2013-03-15 12:29:03.000000000 +0530 | |
44 | @@ -351,7 +351,7 @@ atxmega128a1u:crtx128a1u.o:${DEV_DEFS}:$ | |
45 | atxmega128a4u:crtx128a4u.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS}\ | |
46 | " | |
47 | ||
48 | -AVRTINY10_DEV_INFO="\ | |
49 | +AVRTINY_DEV_INFO="\ | |
50 | attiny4:crttn4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
51 | attiny5:crttn5.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
52 | attiny9:crttn9.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
53 | @@ -379,7 +379,7 @@ avrxmega4:AVRXMEGA4_DEV_INFO:${LIB_DEFS} | |
54 | avrxmega5:AVRXMEGA5_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ | |
55 | avrxmega6:AVRXMEGA6_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ | |
56 | avrxmega7:AVRXMEGA7_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ | |
57 | -avrtiny10:AVRTINY10_DEV_INFO:${LIB_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\ | |
58 | +avrtiny:AVRTINY_DEV_INFO:${LIB_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\ | |
59 | " | |
60 | ||
61 | echo "Generating source directories:" |