From 9069618bb10389a0a3ed540d50e344f03008961e Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 20 Oct 2010 15:25:04 +0200 Subject: [PATCH 01/28] Skip a target compilation ONLY if avr-gcc does not support it --- build_hex.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build_hex.sh b/build_hex.sh index bc5797d..f2e4cbf 100755 --- a/build_hex.sh +++ b/build_hex.sh @@ -9,15 +9,11 @@ all_targets="teensy1 teensypp1 teensy2 teensypp2 \ at90usbkey minimus1 minimus32 maximus \ blackcat xplain olimex usbtinymkii \ - bentio" + bentio openkubus" -avr_gcc_ver=`avr-gcc --version | head -n 1 | awk '{print $3}'` -if [[ $avr_gcc_ver < "4.3.5" ]]; then - echo "OpenKubus compilation disabled. You need avr-gcc version 4.3.5 or later." - echo "(You currently have avr-gcc version ${avr_gcc_ver})" -else - all_targets="${all_targets} openkubus" -fi +function is_mcu_supported() { + avr-gcc --target-help | awk '/^Known MCU names:$/,/^$/' | grep -q $1 +} i=1 for target in ${all_targets}; do @@ -119,6 +115,10 @@ mkdir psgroove_hex $MAKE clean_list > /dev/null for target in ${targets}; do + if ! is_mcu_supported "${mcu[${!target}]}"; then + echo "$target compilation skipped. Your avr-gcc does not support ${mcu[${!target}]}." >&2 + continue + fi for firmware in 3.01 3.10 3.15 3.41 ; do firmware=${firmware/./_} low_board=`echo ${board[${!target}]} | awk '{print tolower($0)}'` From f1177a37725c5d383bbbf29bde88d7f7988bb431 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sat, 23 Oct 2010 13:01:59 -0400 Subject: [PATCH 02/28] Changed Minimus 32 cipset back to atmega32u2 --- Makefile | 2 +- build_hex.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d25cab3..33bb8d0 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ FIRMWARE_VERSION = 3_41 ## Minimus 32 ## It actually is atmega32u2 but at90usb162 is compatible and ## the latest avr-gcc doesn't compile for atmega32u2 -#MCU = at90usb162 +#MCU = atmega32u2 #BOARD = MINIMUS #F_CPU = 16000000 diff --git a/build_hex.sh b/build_hex.sh index f2e4cbf..9751d11 100755 --- a/build_hex.sh +++ b/build_hex.sh @@ -57,7 +57,7 @@ board[$minimus1]=MINIMUS mhz_clock[$minimus1]=16 name[$minimus1]="Minimus v1" -mcu[$minimus32]=at90usb162 +mcu[$minimus32]=atmega32u2 board[$minimus32]=MINIMUS mhz_clock[$minimus32]=16 name[$minimus32]="Minimus 32" From 3e2085bd367ce4ac335370f9177f8b3551e3335d Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sat, 23 Oct 2010 17:42:23 -0400 Subject: [PATCH 03/28] Moved to latest PL3 --- PL3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PL3 b/PL3 index 74d294f..c0e92c9 160000 --- a/PL3 +++ b/PL3 @@ -1 +1 @@ -Subproject commit 74d294fe14610060ddb903a209ecd90b35daf799 +Subproject commit c0e92c9382d6fb06ab569e36102e74c12920f369 From 9bbbe56e8f86e4e390520c36abe68c324b996abb Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sat, 23 Oct 2010 17:53:14 -0400 Subject: [PATCH 04/28] Moved to latest PL3 --- PL3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PL3 b/PL3 index c0e92c9..43b72b2 160000 --- a/PL3 +++ b/PL3 @@ -1 +1 @@ -Subproject commit c0e92c9382d6fb06ab569e36102e74c12920f369 +Subproject commit 43b72b2a6889d265a790b62e46f142f550688f57 From dfa078e71ea87de89cce8e0d75606e1466383a5b Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sun, 24 Oct 2010 11:44:09 -0400 Subject: [PATCH 05/28] Typo fixed for MINIMUS thanx to Sniffynose --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 33bb8d0..0f0fd2f 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ FIRMWARE_VERSION = 3_41 ## Minimus v1 #MCU = at90usb162 -#BOARD = MINUMUS +#BOARD = MINIMUS #F_CPU = 16000000 ## Minimus 32 From 7be9c196bf33b9c46d5bc4eb08517fcbce509f03 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sun, 24 Oct 2010 22:05:07 -0400 Subject: [PATCH 06/28] Set default playload to payload_no_unauth_syscall --- descriptor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptor.h b/descriptor.h index 388d35b..4cef0fd 100644 --- a/descriptor.h +++ b/descriptor.h @@ -24,7 +24,7 @@ #define default_shellcode_macro shellcode_egghunt_macro #define PAYLOAD_FW_DEPENDENT -#define PAYLOAD payload_dev +#define PAYLOAD payload_no_unauth_syscall #if defined (FIRMWARE_3_41) #define FIRMWARE 3_41 From 77deedf2565eb422b2ffd8b42f5a08695128bf54 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sun, 24 Oct 2010 22:05:32 -0400 Subject: [PATCH 07/28] Updated to kakarotos latest build --- PL3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PL3 b/PL3 index 43b72b2..1f9d4a8 160000 --- a/PL3 +++ b/PL3 @@ -1 +1 @@ -Subproject commit 43b72b2a6889d265a790b62e46f142f550688f57 +Subproject commit 1f9d4a8475a5f82908c9c99964c7827b8926951a From 91e84eeabbd787dea1ea841ee6978355edda6488 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Wed, 10 Nov 2010 20:52:17 -0500 Subject: [PATCH 08/28] Now using PL3 from my fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 959f0e9..2bc197b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = http://github.com/psgroove/lufa-lib.git [submodule "PL3"] path = PL3 - url = git://github.com/kakaroto/PL3.git + url = git://github.com/evilsperm/PL3.git From 0ff6454b2e2ffe412c246ad8d5abc40302186f11 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Wed, 10 Nov 2010 20:54:25 -0500 Subject: [PATCH 09/28] set default #define default_payload --- descriptor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptor.h b/descriptor.h index 4cef0fd..759c6f5 100644 --- a/descriptor.h +++ b/descriptor.h @@ -24,7 +24,7 @@ #define default_shellcode_macro shellcode_egghunt_macro #define PAYLOAD_FW_DEPENDENT -#define PAYLOAD payload_no_unauth_syscall +#define PAYLOAD default_payload #if defined (FIRMWARE_3_41) #define FIRMWARE 3_41 From ee23d44615a6498fa7e8c5918309dfeaa289e597 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Wed, 10 Nov 2010 21:31:57 -0500 Subject: [PATCH 10/28] Build all board for firmware 3.15 and 3.41 ONLY! --- build_hex_PSN.sh | 133 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100755 build_hex_PSN.sh diff --git a/build_hex_PSN.sh b/build_hex_PSN.sh new file mode 100755 index 0000000..da24e11 --- /dev/null +++ b/build_hex_PSN.sh @@ -0,0 +1,133 @@ +#!/usr/bin/env bash +# +# Copyright (C) Youness Alaoui (KaKaRoTo) +# +# This software is distributed under the terms of the GNU General Public +# License ("GPL") version 3, as published by the Free Software Foundation. +# + +all_targets="teensy1 teensypp1 teensy2 teensypp2 \ + at90usbkey minimus1 minimus32 maximus \ + blackcat xplain olimex usbtinymkii \ + bentio openkubus" + +function is_mcu_supported() { + avr-gcc --target-help | awk '/^Known MCU names:$/,/^$/' | grep -q $1 +} + +i=1 +for target in ${all_targets}; do + let ${target}=$i + let i++ +done + +if command -v gmake &>/dev/null; then + MAKE=gmake +else + MAKE=make +fi + +mcu[$teensy1]=at90usb162 +board[$teensy1]=TEENSY +mhz_clock[$teensy1]=16 +name[$teensy1]="Teensy 1.0" + +mcu[$teensypp1]=at90usb646 +board[$teensypp1]=TEENSY +mhz_clock[$teensypp1]=16 +name[$teensypp1]="Teensy++ 1.0" + +mcu[$teensy2]=atmega32u4 +board[$teensy2]=TEENSY +mhz_clock[$teensy2]=16 +name[$teensy2]="Teensy 2.0" + +mcu[$teensypp2]=at90usb1286 +board[$teensypp2]=TEENSY +mhz_clock[$teensypp2]=16 +name[$teensypp2]="Teensy++ 2.0" + +mcu[$at90usbkey]=at90usb1287 +board[$at90usbkey]=USBKEY +mhz_clock[$at90usbkey]=8 +name[$at90usbkey]="AT90USBKEY" + +mcu[$minimus1]=at90usb162 +board[$minimus1]=MINIMUS +mhz_clock[$minimus1]=16 +name[$minimus1]="Minimus v1" + +mcu[$minimus32]=atmega32u2 +board[$minimus32]=MINIMUS +mhz_clock[$minimus32]=16 +name[$minimus32]="Minimus 32" + +mcu[$maximus]=at90usb162 +board[$maximus]=MAXIMUS +mhz_clock[$maximus]=16 +name[$maximus]="Maximus" + +mcu[$blackcat]=at90usb162 +board[$blackcat]=BLACKCAT +mhz_clock[$blackcat]=16 +name[$blackcat]="Blackcat" + +mcu[$xplain]=at90usb1287 +board[$xplain]=XPLAIN +mhz_clock[$xplain]=8 +name[$xplain]="XPLAIN" + +mcu[$olimex]=at90usb162 +board[$olimex]=OLIMEX +mhz_clock[$olimex]=8 +name[$olimex]="Olimex" + +mcu[$usbtinymkii]=at90usb162 +board[$usbtinymkii]=USBTINYMKII +mhz_clock[$usbtinymkii]=16 +name[$usbtinymkii]="USBTINYMKII" + +mcu[$bentio]=at90usb162 +board[$bentio]=BENTIO +mhz_clock[$bentio]=16 +name[$bentio]="Bentio" + +mcu[$openkubus]=atmega16u4 +board[$openkubus]=USBKEY +mhz_clock[$openkubus]=8 +name[$openkubus]="OpenKubus" + + +while [ "x$1" != "x" ]; do + targets="$targets ${1}" + shift +done +if [ "x$targets" == "x" ]; then + for i in ${all_targets}; do + targets="$targets ${i}" + done +fi + +echo "Building for targets : $targets" + +rm -rf psgroove_hex/ +mkdir psgroove_hex +$MAKE clean_list > /dev/null + +for target in ${targets}; do + if ! is_mcu_supported "${mcu[${!target}]}"; then + echo "$target compilation skipped. Your avr-gcc does not support ${mcu[${!target}]}." >&2 + continue + fi + for firmware in 3.15 3.41 ; do + firmware=${firmware/./_} + low_board=`echo ${board[${!target}]} | awk '{print tolower($0)}'` + filename="psgroove_${low_board}_${mcu[${!target}]}_${mhz_clock[${!target}]}mhz_firmware_${firmware}" + echo "Compiling $filename for ${name[${!target}]}" + $MAKE TARGET=$filename MCU=${mcu[${!target}]} BOARD=${board[${!target}]} F_CPU=${mhz_clock[${!target}]}000000 FIRMWARE_VERSION=${firmware} > /dev/null || exit 1 + mkdir -p "psgroove_hex/${name[${!target}]}" + mv *.hex "psgroove_hex/${name[${!target}]}/" + $MAKE clean_list TARGET=$filename > /dev/null + done +done + From 8949b7e8d62de8a6d07db369adadc28d6637f978 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 03:02:32 -0500 Subject: [PATCH 11/28] temp remove --- .gitmodules | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2bc197b..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "lufa-lib"] - path = lufa-lib - url = http://github.com/psgroove/lufa-lib.git -[submodule "PL3"] - path = PL3 - url = git://github.com/evilsperm/PL3.git From 8ef0b21a92df5bdd8e8cc2aef92636d6e7279555 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 03:04:41 -0500 Subject: [PATCH 12/28] Using my PL3 Fork now --- .gitmodules | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2bc197b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "lufa-lib"] + path = lufa-lib + url = http://github.com/psgroove/lufa-lib.git +[submodule "PL3"] + path = PL3 + url = git://github.com/evilsperm/PL3.git From 1d1f1b5b26022455adbf75cd9f36d8a7815afcdb Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 03:09:13 -0500 Subject: [PATCH 13/28] removed to use evilsperm fork --- PL3 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 PL3 diff --git a/PL3 b/PL3 deleted file mode 160000 index 1f9d4a8..0000000 --- a/PL3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1f9d4a8475a5f82908c9c99964c7827b8926951a From 6e2efe4166dcd07793eff252a4609f72b2ceae82 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 03:11:54 -0500 Subject: [PATCH 14/28] using my PL3 now --- PL3 | 1 + 1 file changed, 1 insertion(+) create mode 160000 PL3 diff --git a/PL3 b/PL3 new file mode 160000 index 0000000..1a4f015 --- /dev/null +++ b/PL3 @@ -0,0 +1 @@ +Subproject commit 1a4f0150611f2b75c19e73d6939c33ac2a4669ac From 233ac65dbd791d9ba10dff51ae62a42b2830d684 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 13:40:28 -0500 Subject: [PATCH 15/28] usless --- build_hex_PSN.sh | 133 ----------------------------------------------- 1 file changed, 133 deletions(-) delete mode 100755 build_hex_PSN.sh diff --git a/build_hex_PSN.sh b/build_hex_PSN.sh deleted file mode 100755 index da24e11..0000000 --- a/build_hex_PSN.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (C) Youness Alaoui (KaKaRoTo) -# -# This software is distributed under the terms of the GNU General Public -# License ("GPL") version 3, as published by the Free Software Foundation. -# - -all_targets="teensy1 teensypp1 teensy2 teensypp2 \ - at90usbkey minimus1 minimus32 maximus \ - blackcat xplain olimex usbtinymkii \ - bentio openkubus" - -function is_mcu_supported() { - avr-gcc --target-help | awk '/^Known MCU names:$/,/^$/' | grep -q $1 -} - -i=1 -for target in ${all_targets}; do - let ${target}=$i - let i++ -done - -if command -v gmake &>/dev/null; then - MAKE=gmake -else - MAKE=make -fi - -mcu[$teensy1]=at90usb162 -board[$teensy1]=TEENSY -mhz_clock[$teensy1]=16 -name[$teensy1]="Teensy 1.0" - -mcu[$teensypp1]=at90usb646 -board[$teensypp1]=TEENSY -mhz_clock[$teensypp1]=16 -name[$teensypp1]="Teensy++ 1.0" - -mcu[$teensy2]=atmega32u4 -board[$teensy2]=TEENSY -mhz_clock[$teensy2]=16 -name[$teensy2]="Teensy 2.0" - -mcu[$teensypp2]=at90usb1286 -board[$teensypp2]=TEENSY -mhz_clock[$teensypp2]=16 -name[$teensypp2]="Teensy++ 2.0" - -mcu[$at90usbkey]=at90usb1287 -board[$at90usbkey]=USBKEY -mhz_clock[$at90usbkey]=8 -name[$at90usbkey]="AT90USBKEY" - -mcu[$minimus1]=at90usb162 -board[$minimus1]=MINIMUS -mhz_clock[$minimus1]=16 -name[$minimus1]="Minimus v1" - -mcu[$minimus32]=atmega32u2 -board[$minimus32]=MINIMUS -mhz_clock[$minimus32]=16 -name[$minimus32]="Minimus 32" - -mcu[$maximus]=at90usb162 -board[$maximus]=MAXIMUS -mhz_clock[$maximus]=16 -name[$maximus]="Maximus" - -mcu[$blackcat]=at90usb162 -board[$blackcat]=BLACKCAT -mhz_clock[$blackcat]=16 -name[$blackcat]="Blackcat" - -mcu[$xplain]=at90usb1287 -board[$xplain]=XPLAIN -mhz_clock[$xplain]=8 -name[$xplain]="XPLAIN" - -mcu[$olimex]=at90usb162 -board[$olimex]=OLIMEX -mhz_clock[$olimex]=8 -name[$olimex]="Olimex" - -mcu[$usbtinymkii]=at90usb162 -board[$usbtinymkii]=USBTINYMKII -mhz_clock[$usbtinymkii]=16 -name[$usbtinymkii]="USBTINYMKII" - -mcu[$bentio]=at90usb162 -board[$bentio]=BENTIO -mhz_clock[$bentio]=16 -name[$bentio]="Bentio" - -mcu[$openkubus]=atmega16u4 -board[$openkubus]=USBKEY -mhz_clock[$openkubus]=8 -name[$openkubus]="OpenKubus" - - -while [ "x$1" != "x" ]; do - targets="$targets ${1}" - shift -done -if [ "x$targets" == "x" ]; then - for i in ${all_targets}; do - targets="$targets ${i}" - done -fi - -echo "Building for targets : $targets" - -rm -rf psgroove_hex/ -mkdir psgroove_hex -$MAKE clean_list > /dev/null - -for target in ${targets}; do - if ! is_mcu_supported "${mcu[${!target}]}"; then - echo "$target compilation skipped. Your avr-gcc does not support ${mcu[${!target}]}." >&2 - continue - fi - for firmware in 3.15 3.41 ; do - firmware=${firmware/./_} - low_board=`echo ${board[${!target}]} | awk '{print tolower($0)}'` - filename="psgroove_${low_board}_${mcu[${!target}]}_${mhz_clock[${!target}]}mhz_firmware_${firmware}" - echo "Compiling $filename for ${name[${!target}]}" - $MAKE TARGET=$filename MCU=${mcu[${!target}]} BOARD=${board[${!target}]} F_CPU=${mhz_clock[${!target}]}000000 FIRMWARE_VERSION=${firmware} > /dev/null || exit 1 - mkdir -p "psgroove_hex/${name[${!target}]}" - mv *.hex "psgroove_hex/${name[${!target}]}/" - $MAKE clean_list TARGET=$filename > /dev/null - done -done - From ceef4480ae16c8e52888f902b795bca8378ee0c2 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 13:40:50 -0500 Subject: [PATCH 16/28] supporting firmware 3.41 ONLY! for now --- build_hex.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_hex.sh b/build_hex.sh index 9751d11..18de65c 100755 --- a/build_hex.sh +++ b/build_hex.sh @@ -119,7 +119,7 @@ for target in ${targets}; do echo "$target compilation skipped. Your avr-gcc does not support ${mcu[${!target}]}." >&2 continue fi - for firmware in 3.01 3.10 3.15 3.41 ; do + for firmware in 3.41 ; do firmware=${firmware/./_} low_board=`echo ${board[${!target}]} | awk '{print tolower($0)}'` filename="psgroove_${low_board}_${mcu[${!target}]}_${mhz_clock[${!target}]}mhz_firmware_${firmware}" From bc3139b0cc5bf566144fb80ddfaa39d7272be32f Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 11 Nov 2010 13:41:23 -0500 Subject: [PATCH 17/28] latest commit from vidarino --- PL3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PL3 b/PL3 index 1a4f015..5d6a82e 160000 --- a/PL3 +++ b/PL3 @@ -1 +1 @@ -Subproject commit 1a4f0150611f2b75c19e73d6939c33ac2a4669ac +Subproject commit 5d6a82e213bc06d9f0e6e90740144cb321425fcf From 543823de78034c3e5c947b44c92aae92fa972294 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 12:48:24 -0500 Subject: [PATCH 18/28] PSN/eco mod PL3 --- PL3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PL3 b/PL3 index 5d6a82e..d5ee025 160000 --- a/PL3 +++ b/PL3 @@ -1 +1 @@ -Subproject commit 5d6a82e213bc06d9f0e6e90740144cb321425fcf +Subproject commit d5ee0257599315d7ff24e08501e827c141d47dd1 From a8e8ab3b6cb99c37b2d9c269424685d324acc2ce Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 12:50:04 -0500 Subject: [PATCH 19/28] removed old commit --- PL3 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 PL3 diff --git a/PL3 b/PL3 deleted file mode 160000 index d5ee025..0000000 --- a/PL3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d5ee0257599315d7ff24e08501e827c141d47dd1 From 855cb8046fb166fae14754ab61ca80eac99ab2cf Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 12:53:02 -0500 Subject: [PATCH 20/28] PSN/eco mod PL3 currently only supports firmware 3.41 --- PL3 | 1 + 1 file changed, 1 insertion(+) create mode 160000 PL3 diff --git a/PL3 b/PL3 new file mode 160000 index 0000000..d5ee025 --- /dev/null +++ b/PL3 @@ -0,0 +1 @@ +Subproject commit d5ee0257599315d7ff24e08501e827c141d47dd1 From e7872ab16322169648b07e74a4519f23cf3c4b64 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 21:47:46 -0500 Subject: [PATCH 21/28] added atvrusbrf01 udip8 udip16 avrkey ps2chiper --- build_hex.sh | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/build_hex.sh b/build_hex.sh index 18de65c..34a036c 100755 --- a/build_hex.sh +++ b/build_hex.sh @@ -9,7 +9,8 @@ all_targets="teensy1 teensypp1 teensy2 teensypp2 \ at90usbkey minimus1 minimus32 maximus \ blackcat xplain olimex usbtinymkii \ - bentio openkubus" + bentio openkubus atvrusbrf01 udip8 udip16 \ + avrkey ps2chiper" function is_mcu_supported() { avr-gcc --target-help | awk '/^Known MCU names:$/,/^$/' | grep -q $1 @@ -97,6 +98,30 @@ board[$openkubus]=USBKEY mhz_clock[$openkubus]=8 name[$openkubus]="OpenKubus" +mcu[$atvrusbrf01]=at90usb162 +board[$atvrusbrf01]=ATAVRUSBRF01 +mhz_clock[$atvrusbrf01]=16 +name[$atvrusbrf01]="ATAVRUSBRF01" + +mcu[$udip8]=at90usb162 +board[$udip8]=UDIP +mhz_clock[$udip8]=8 +name[$udip8]="UDIP8" + +mcu[$udip16]=at90usb162 +board[$udip16]=UDIP +mhz_clock[$udip16]=16 +name[$udip16]="UDIP16" + +mcu[$avrkey]=atmega32u2 +board[$avrkey]=AVRKEY +mhz_clock[$avrkey]=16 +name[$avrkey]="AVRKEY" + +mcu[$ps2chiper]=at90usb162 +board[$ps2chiper]=PS2CHIPER +mhz_clock[$ps2chiper]=8 +name[$ps2chiper]="PS2CHIPER" while [ "x$1" != "x" ]; do targets="$targets ${1}" From 06031067adeb4b18afd24f344127d44469c6dee4 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 21:48:12 -0500 Subject: [PATCH 22/28] using evilsperm lufa-lib fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2bc197b..addd091 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "lufa-lib"] path = lufa-lib - url = http://github.com/psgroove/lufa-lib.git + url = http://github.com/evilsperm/lufa-lib.git [submodule "PL3"] path = PL3 url = git://github.com/evilsperm/PL3.git From f6934bc73fb99f40d687634bb9eb31ab4cbfb29c Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 21:48:30 -0500 Subject: [PATCH 23/28] new evilsperm lufa-lib --- lufa-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lufa-lib b/lufa-lib index 88cdf5e..9c203dc 160000 --- a/lufa-lib +++ b/lufa-lib @@ -1 +1 @@ -Subproject commit 88cdf5e08121d6cf6101af35c97933e553134ddb +Subproject commit 9c203dc5b050f77617a857293ca932cd27fe304a From ce133389621858c32ee348992acb2be6f00401e1 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Fri, 12 Nov 2010 21:48:41 -0500 Subject: [PATCH 24/28] added atvrusbrf01 udip8 udip16 avrkey ps2chiper --- Makefile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Makefile b/Makefile index 0f0fd2f..af96ce6 100644 --- a/Makefile +++ b/Makefile @@ -158,6 +158,30 @@ FIRMWARE_VERSION = 3_41 #BOARD = USBKEY #F_CPU = 8000000 +# ATAVRUSBRF01 +#MCU = at90usb162 +#BOARD = ATAVRUSBRF01 +#F_CPU = 16000000 + +# UDIP8 +#MCU = at90usb162 +#BOARD = UDIP +#F_CPU = 8000000 + +# UDIP16 +#MCU = at90usb162 +#BOARD = UDIP +#F_CPU = 16000000 + +# AVRKEY +#MCU = atmega32u2 +#BOARD = AVRKEY +#F_CPU = 16000000 + +# PS2CHIPER +#MCU = at90usb162 +#BOARD = PS2CHIPER +#F_CPU = 8000000 # Input clock frequency. # This will define a symbol, F_CLOCK, in all source code files equal to the From bb44921aa3226d7238c04c223c2b99d212b0c3c4 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Sat, 13 Nov 2010 00:35:37 -0500 Subject: [PATCH 25/28] added all payload defines, just select the one you want to use. --- descriptor.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/descriptor.h b/descriptor.h index 759c6f5..cfcdcf1 100644 --- a/descriptor.h +++ b/descriptor.h @@ -23,8 +23,12 @@ #define default_shellcode shellcode_egghunt #define default_shellcode_macro shellcode_egghunt_macro +/* Select Your Payload */ #define PAYLOAD_FW_DEPENDENT #define PAYLOAD default_payload +/* #define PAYLOAD payload_dev */ +/* #define PAYLOAD payload_no_unauth_syscall */ +/* #define PAYLOAD payload_dump_elfs */ #if defined (FIRMWARE_3_41) #define FIRMWARE 3_41 From e4133c3734413a303af782055d2156863c0a0391 Mon Sep 17 00:00:00 2001 From: evilsperm Date: Mon, 15 Nov 2010 16:56:50 -0500 Subject: [PATCH 26/28] added dump_lv2 define --- descriptor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/descriptor.h b/descriptor.h index cfcdcf1..0edceb2 100644 --- a/descriptor.h +++ b/descriptor.h @@ -29,6 +29,7 @@ /* #define PAYLOAD payload_dev */ /* #define PAYLOAD payload_no_unauth_syscall */ /* #define PAYLOAD payload_dump_elfs */ +/* #define PAYLOAD dump_lv2 */ #if defined (FIRMWARE_3_41) #define FIRMWARE 3_41 From b9f0112e0f73000e3597e433cf0b88d2afe7627a Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 18 Nov 2010 15:23:27 -0500 Subject: [PATCH 27/28] made changed to lufa-lib --- lufa-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lufa-lib b/lufa-lib index 9c203dc..cc8e5f4 160000 --- a/lufa-lib +++ b/lufa-lib @@ -1 +1 @@ -Subproject commit 9c203dc5b050f77617a857293ca932cd27fe304a +Subproject commit cc8e5f4cdccbff0441cefcfe9c96131ea2a4d9a3 From ae73f39419a27a1ba8da96dcf979a3fd4aff1dbd Mon Sep 17 00:00:00 2001 From: evilsperm Date: Thu, 18 Nov 2010 15:23:40 -0500 Subject: [PATCH 28/28] added support for JMDBU2 --- Makefile | 5 +++++ build_hex.sh | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af96ce6..d378612 100644 --- a/Makefile +++ b/Makefile @@ -183,6 +183,11 @@ FIRMWARE_VERSION = 3_41 #BOARD = PS2CHIPER #F_CPU = 8000000 +# JMDBU2 +MCU = atmega32u4 +BOARD = JMDBU2 +F_CPU = 8000000 + # Input clock frequency. # This will define a symbol, F_CLOCK, in all source code files equal to the # input clock frequency (before any prescaling is performed) in Hz. This value may diff --git a/build_hex.sh b/build_hex.sh index 34a036c..c39abc0 100755 --- a/build_hex.sh +++ b/build_hex.sh @@ -10,7 +10,7 @@ all_targets="teensy1 teensypp1 teensy2 teensypp2 \ at90usbkey minimus1 minimus32 maximus \ blackcat xplain olimex usbtinymkii \ bentio openkubus atvrusbrf01 udip8 udip16 \ - avrkey ps2chiper" + avrkey ps2chiper jmdbu2" function is_mcu_supported() { avr-gcc --target-help | awk '/^Known MCU names:$/,/^$/' | grep -q $1 @@ -123,6 +123,11 @@ board[$ps2chiper]=PS2CHIPER mhz_clock[$ps2chiper]=8 name[$ps2chiper]="PS2CHIPER" +mcu[$jmdbu2]=atmega32u4 +board[$jmdbu2]=JMDBU2 +mhz_clock[$jmdbu2]=8 +name[$jmdbu2]="JMDBU2" + while [ "x$1" != "x" ]; do targets="$targets ${1}" shift