]>
Commit | Line | Data |
---|---|---|
9fe267c2 PZ |
1 | diff -Naurp configure.ac configure.ac |
2 | --- configure.ac 2012-11-05 10:20:18.000000000 +0530 | |
3 | +++ configure.ac 2012-11-05 10:26:56.000000000 +0530 | |
4 | @@ -458,9 +458,6 @@ AM_CONDITIONAL(HAS_attiny26, true) | |
5 | CHECK_AVR_DEVICE(avr25) | |
6 | AM_CONDITIONAL(HAS_avr25, test "x$HAS_avr25" = "xyes") | |
7 | ||
8 | -CHECK_AVR_DEVICE(ata6289) | |
9 | -AM_CONDITIONAL(HAS_ata6289, test "x$HAS_ata6289" = "xyes") | |
10 | - | |
11 | CHECK_AVR_DEVICE(ata5272) | |
12 | AM_CONDITIONAL(HAS_ata5272, test "x$HAS_ata5272" = "xyes") | |
13 | ||
14 | @@ -597,6 +594,9 @@ AM_CONDITIONAL(HAS_ata6285, test "x$HAS_ | |
15 | CHECK_AVR_DEVICE(ata6286) | |
16 | AM_CONDITIONAL(HAS_ata6286, test "x$HAS_ata6286" = "xyes") | |
17 | ||
18 | +CHECK_AVR_DEVICE(ata6289) | |
19 | +AM_CONDITIONAL(HAS_ata6289, test "x$HAS_ata6289" = "xyes") | |
20 | + | |
21 | CHECK_AVR_DEVICE(atmega8a) | |
22 | AM_CONDITIONAL(HAS_atmega8a, test "x$HAS_atmega8a" = "xyes") | |
23 | ||
24 | @@ -1223,7 +1223,6 @@ AC_CONFIG_FILES([ | |
25 | AC_CONFIG_FILES([ | |
26 | avr/lib/avr25/Makefile | |
27 | avr/lib/avr25/at86rf401/Makefile | |
28 | - avr/lib/avr25/ata6289/Makefile | |
29 | avr/lib/avr25/ata5272/Makefile | |
30 | avr/lib/avr25/attiny13/Makefile | |
31 | avr/lib/avr25/attiny13a/Makefile | |
32 | @@ -1288,6 +1287,7 @@ AC_CONFIG_FILES([ | |
33 | avr/lib/avr4/Makefile | |
34 | avr/lib/avr4/ata6285/Makefile | |
35 | avr/lib/avr4/ata6286/Makefile | |
36 | + avr/lib/avr4/ata6289/Makefile | |
37 | avr/lib/avr4/atmega48/Makefile | |
38 | avr/lib/avr4/atmega48a/Makefile | |
39 | avr/lib/avr4/atmega48pa/Makefile | |
40 | diff -Naurp devtools/gen-avr-lib-tree.sh devtools/gen-avr-lib-tree.sh | |
41 | --- devtools/gen-avr-lib-tree.sh 2012-11-05 10:20:18.000000000 +0530 | |
42 | +++ devtools/gen-avr-lib-tree.sh 2012-11-05 10:28:48.000000000 +0530 | |
43 | @@ -83,7 +83,6 @@ attiny861:crttn861.o:${DEV_DEFS}:${CFLAG | |
44 | ||
45 | AVR25_DEV_INFO="\ | |
46 | at86rf401:crt86401.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
47 | -ata6289:crta6289.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
48 | ata5272:crta5272.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
49 | attiny13:crttn13.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
50 | attiny13a:crttn13a.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
51 | @@ -140,6 +139,7 @@ attiny1634:crttn1634.o:${DEV_DEFS}:${CFL | |
52 | AVR4_DEV_INFO="\ | |
53 | ata6285:crta6285.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
54 | ata6286:crta6286.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
55 | +ata6289:crta6289.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
56 | atmega48:crtm48.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
57 | atmega48a:crtm48a.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
58 | atmega48pa:crtm48pa.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
59 | diff -Naurp include/avr/power.h include/avr/power.h | |
60 | --- include/avr/power.h 2012-11-05 10:21:35.000000000 +0530 | |
61 | +++ include/avr/power.h 2012-11-05 10:45:09.000000000 +0530 | |
62 | @@ -3051,7 +3051,8 @@ void timer_clock_prescale_set(timer_cloc | |
63 | #define timer_clock_prescale_get() (timer_clock_div_t)(CLKPR & (uint8_t)((1<<CLTPS0)|(1<<CLTPS1)|(1<<CLTPS2))) | |
64 | ||
65 | #elif defined(__AVR_ATA6285__) \ | |
66 | -|| defined(__AVR_ATA6286__) | |
67 | +|| defined(__AVR_ATA6286__) \ | |
68 | +|| defined(__AVR_ATA6289__) | |
69 | ||
70 | typedef enum | |
71 | { |