Merge branch 'XePeleato-master'

seemoo-lab · Sep 19, 2016 · 06810af · 06810af
2 parents 1840448 + 98856eb
commit 06810af
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/firmware_patching/include/bcm43438.h b/firmware_patching/include/bcm43438.h
@@ -4,5 +4,6 @@
 /* addresses of static structs */
 #define SDIO_INFO_ADDR			((void *) 0x6c5a8)
 #define OSL_INFO_ADDR           ((void *) 0x6b950)
+#define WLC_INFO_ADDR           ((void *) 0x6ad6c)
 
 #endif /*BCM43438_H*/
diff --git a/firmware_patching/monitor_mode/Makefile b/firmware_patching/monitor_mode/Makefile
@@ -5,6 +5,8 @@ FUNCTIONS_BIN = $(FUNCTIONS:=.bin)
 all: brcmfmac/brcmfmac.ko brcmfmac43430-sdio.bin
 
 brcmfmac/brcmfmac.ko: check-nexmon-setup-env
+	make -C ../../kernel/ bcm2709_defconfig
+	make -C ../../kernel/
 	make -C ../../kernel/ M=$$PWD/brcmfmac -j2
 
 brcmfmac43430-sdio.bin: patcher.py patch.elf text.bin $(FUNCTIONS_BIN)

diff --git a/firmware_patching/monitor_mode/brcm.h b/firmware_patching/monitor_mode/brcm.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "../include/types.h"
+#define WL_CHANSPEC_CHAN_MASK       0x00ff
+#define CHSPEC_CHANNEL(chspec)  ((uint8_t)((chspec) & WL_CHANSPEC_CHAN_MASK))
diff --git a/setup_env.sh b/setup_env.sh
@@ -1,3 +1,4 @@
+if [ -d "$(pwd)/buildtools" ]; then
 export CC=$(pwd)/buildtools/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
 export CROSS_COMPILE=$(pwd)/buildtools/arm-eabi-4.7/bin/arm-eabi-
 
@@ -8,3 +9,9 @@ export NEXMON_FIRMWARE_PATCHING=$(pwd)/firmware_patching
 export NEXMON_ROOT=$(pwd)
 
 export NEXMON_SETUP_ENV=1
+
+else 
+
+echo "This script should be run at nexmon's root folder!"
+fi
+