Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minumus Typo Fixed #4

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9069618
Skip a target compilation ONLY if avr-gcc does not support it
drizzt Oct 20, 2010
f1177a3
Changed Minimus 32 cipset back to atmega32u2
Oct 23, 2010
3e2085b
Moved to latest PL3
Oct 23, 2010
9bbbe56
Moved to latest PL3
Oct 23, 2010
dfa078e
Typo fixed for MINIMUS thanx to Sniffynose
Oct 24, 2010
7be9c19
Set default playload to payload_no_unauth_syscall
Oct 25, 2010
77deedf
Updated to kakarotos latest build
Oct 25, 2010
91e84ee
Now using PL3 from my fork
evilsperm Nov 11, 2010
0ff6454
set default #define default_payload
evilsperm Nov 11, 2010
ee23d44
Build all board for firmware 3.15 and 3.41 ONLY!
evilsperm Nov 11, 2010
8949b7e
temp remove
evilsperm Nov 11, 2010
8ef0b21
Using my PL3 Fork now
evilsperm Nov 11, 2010
1d1f1b5
removed to use evilsperm fork
evilsperm Nov 11, 2010
6e2efe4
using my PL3 now
evilsperm Nov 11, 2010
233ac65
usless
evilsperm Nov 11, 2010
ceef448
supporting firmware 3.41 ONLY! for now
evilsperm Nov 11, 2010
bc3139b
latest commit from vidarino
evilsperm Nov 11, 2010
543823d
PSN/eco mod PL3
evilsperm Nov 12, 2010
a8e8ab3
removed old commit
evilsperm Nov 12, 2010
855cb80
PSN/eco mod PL3 currently only supports firmware 3.41
evilsperm Nov 12, 2010
e7872ab
added atvrusbrf01 udip8 udip16 avrkey ps2chiper
evilsperm Nov 13, 2010
0603106
using evilsperm lufa-lib fork
evilsperm Nov 13, 2010
f6934bc
new evilsperm lufa-lib
evilsperm Nov 13, 2010
ce13338
added atvrusbrf01 udip8 udip16 avrkey ps2chiper
evilsperm Nov 13, 2010
bb44921
added all payload defines, just select the one you want to use.
evilsperm Nov 13, 2010
e4133c3
added dump_lv2 define
evilsperm Nov 15, 2010
b9f0112
made changed to lufa-lib
evilsperm Nov 18, 2010
ae73f39
added support for JMDBU2
evilsperm Nov 18, 2010
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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/kakaroto/PL3.git
url = git://github.com/evilsperm/PL3.git
33 changes: 31 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ FIRMWARE_VERSION = 3_41

## Minimus v1
#MCU = at90usb162
#BOARD = MINUMUS
#BOARD = MINIMUS
#F_CPU = 16000000

## 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

Expand Down Expand Up @@ -158,6 +158,35 @@ 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

# 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
Expand Down
2 changes: 1 addition & 1 deletion PL3
Submodule PL3 updated 52 files
+2 −0 .gitignore
+264 −198 HOWTO
+20 −3 Makefile
+73 −0 default_payload.S
+ default_payload_3_01.bin
+0 −618 default_payload_3_01.h
+ default_payload_3_10.bin
+0 −618 default_payload_3_10.h
+ default_payload_3_15.bin
+0 −618 default_payload_3_15.h
+ default_payload_3_41.bin
+0 −618 default_payload_3_41.h
+6 −6 device6_kmod.h.S
+ dump_lv2.bin
+0 −485 dump_lv2.h
+525 −0 firmware_symbols.h.S
+720 −0 index.dat.S
+145 −350 macros.h.S
+2 −1 map_open_path.h.S
+6 −0 memory_patching.h.S
+54 −0 modelset.h.S
+3 −3 open_hook.h.S
+223 −158 payload_dev.S
+ payload_dev_3_01.bin
+0 −626 payload_dev_3_01.h
+ payload_dev_3_10.bin
+0 −626 payload_dev_3_10.h
+ payload_dev_3_15.bin
+0 −626 payload_dev_3_15.h
+ payload_dev_3_41.bin
+0 −626 payload_dev_3_41.h
+ payload_dump_elfs_3_01.bin
+0 −582 payload_dump_elfs_3_01.h
+ payload_dump_elfs_3_10.bin
+0 −582 payload_dump_elfs_3_10.h
+ payload_dump_elfs_3_15.bin
+0 −582 payload_dump_elfs_3_15.h
+ payload_dump_elfs_3_41.bin
+0 −582 payload_dump_elfs_3_41.h
+217 −0 payload_no_unauth_syscall.S
+43 −0 print_bt.h.S
+ shellcode_egghunt.bin
+0 −20 shellcode_egghunt.h
+ shellcode_panic.bin
+0 −20 shellcode_panic.h
+2 −2 syscall36.h.S
+29 −31 tools/dump_elfs_pcap_to_dir.c
+26 −28 tools/dump_lv2_pcap_to_bin.c
+66 −0 tools/find_lv1_call.idc
+25 −0 tools/find_stdu.idc
+4 −208 tools/lv2_dump_analyser.idc
+431 −0 tools/syscall_names.idh
50 changes: 40 additions & 10 deletions build_hex.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@
all_targets="teensy1 teensypp1 teensy2 teensypp2 \
at90usbkey minimus1 minimus32 maximus \
blackcat xplain olimex usbtinymkii \
bentio"
bentio openkubus atvrusbrf01 udip8 udip16 \
avrkey ps2chiper jmdbu2"

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
Expand Down Expand Up @@ -61,7 +58,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"
Expand Down Expand Up @@ -101,6 +98,35 @@ 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"

mcu[$jmdbu2]=atmega32u4
board[$jmdbu2]=JMDBU2
mhz_clock[$jmdbu2]=8
name[$jmdbu2]="JMDBU2"

while [ "x$1" != "x" ]; do
targets="$targets ${1}"
Expand All @@ -119,7 +145,11 @@ mkdir psgroove_hex
$MAKE clean_list > /dev/null

for target in ${targets}; do
for firmware in 3.01 3.10 3.15 3.41 ; 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.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}"
Expand Down
7 changes: 6 additions & 1 deletion descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@
#define default_shellcode shellcode_egghunt
#define default_shellcode_macro shellcode_egghunt_macro

/* Select Your Payload */
#define PAYLOAD_FW_DEPENDENT
#define PAYLOAD payload_dev
#define PAYLOAD default_payload
/* #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
Expand Down