Skip to content

Commit

Permalink
Small filename changes in 7_45_77_0_hw
Browse files Browse the repository at this point in the history
  • Loading branch information
@baselsayeh
baselsayeh committed Dec 22, 2017
1 parent 9acbd78 commit 213a304
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
32 changes: 16 additions & 16 deletions patches/bcm43455/7_45_77_0_hw/nexmon/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CFLAGS= \
-Iinclude \
-I$(FW_PATH)

all: fw_bcmdhd.bin
all: fw_bcm43455_hw.bin

init: FORCE
$(Q)if ! test -f BUILD_NUMBER; then echo 0 > BUILD_NUMBER; fi
Expand Down Expand Up @@ -63,7 +63,7 @@ gen/nexmon.ld: gen/nexmon2.pre $(OBJS)

gen/nexmon.mk: gen/nexmon2.pre $(OBJS) $(FW_PATH)/definitions.mk
@printf "\033[0;31m GENERATING MAKE FILE\033[0m gen/nexmon.pre => %s\n" $@
$(Q)printf "fw_bcmdhd.bin: gen/patch.elf FORCE\n" > $@
$(Q)printf "fw_bcm43455_hw.bin: gen/patch.elf FORCE\n" > $@
$(Q)sort gen/nexmon2.pre | \
gawk -v src_file=gen/patch.elf -f $(NEXMON_ROOT)/buildtools/scripts/nexmon.mk.1.awk | \
gawk -v ramstart=$(RAMSTART) -f $(NEXMON_ROOT)/buildtools/scripts/nexmon.mk.2.awk >> $@
Expand All @@ -86,7 +86,7 @@ gen/flashpatches.mk: gen/nexmon2.pre $(OBJS) $(FW_PATH)/definitions.mk
-v fp_config_base_ptr_2=$(FP_CONFIG_BASE_PTR_2) \
-v fp_config_end_ptr_2=$(FP_CONFIG_END_PTR_2) \
-v ramstart=$(RAMSTART) \
-v out_file=fw_bcmdhd.bin \
-v out_file=fw_bcm43455_hw.bin \
-v src_file=gen/patch.elf \
-f $(NEXMON_ROOT)/buildtools/scripts/flashpatches.mk.awk > $@

Expand All @@ -102,18 +102,18 @@ gen/patch.elf: patch.ld gen/nexmon.ld gen/flashpatches.ld gen/memory.ld $(OBJS)
@printf "\033[0;31m LINKING OBJECTS\033[0m => %s (details: log/linker.log, log/linker.err)\n" $@
$(Q)$(CC)ld -T $< -o $@ --gc-sections --print-gc-sections -M >>log/linker.log 2>>log/linker.err

fw_bcmdhd.bin: init gen/patch.elf $(FW_PATH)/$(RAM_FILE) gen/nexmon.mk gen/flashpatches.mk
fw_bcm43455_hw.bin: init gen/patch.elf $(FW_PATH)/$(RAM_FILE) gen/nexmon.mk gen/flashpatches.mk
$(Q)cp $(FW_PATH)/$(RAM_FILE) $@
@printf "\033[0;31m APPLYING FLASHPATCHES\033[0m gen/flashpatches.mk => %s (details: log/flashpatches.log)\n" $@
$(Q)make -f gen/flashpatches.mk >>log/flashpatches.log 2>>log/flashpatches.log
@printf "\033[0;31m APPLYING PATCHES\033[0m gen/nexmon.mk => %s (details: log/patches.log)\n" $@
$(Q)make -f gen/nexmon.mk >>log/patches.log 2>>log/flashpatches.log

fw_bcmdhd.complete.clean.bin: $(FW_PATH)/$(RAM_FILE) $(FW_PATH)/$(ROM_FILE)
fw_bcm43455_hw.complete.clean.bin: $(FW_PATH)/$(RAM_FILE) $(FW_PATH)/$(ROM_FILE)
dd if=$(FW_PATH)/$(ROM_FILE) of=$@ bs=1 status=none conv=notrunc seek=$$(($(ROMSTART)))
dd if=$< of=$@ bs=1 status=none conv=notrunc seek=$$(($(RAMSTART)))

fw_bcmdhd.complete.bin: fw_bcmdhd.bin $(FW_PATH)/$(ROM_FILE)
fw_bcm43455_hw.complete.bin: fw_bcm43455_hw.bin $(FW_PATH)/$(ROM_FILE)
dd if=$(FW_PATH)/$(ROM_FILE) of=$@ bs=1 status=none conv=notrunc seek=$$(($(ROMSTART)))
dd if=$< of=$@ bs=1 status=none conv=notrunc seek=$$(($(RAMSTART)))

Expand Down Expand Up @@ -158,13 +158,13 @@ ifndef NEXMON_SETUP_ENV
$(error run 'source setup_env.sh' first in the repository\'s root directory)
endif

install-firmware: fw_bcmdhd.bin
install-firmware: fw_bcm43455_hw.bin
@printf "\033[0;31m REMOUNTING /vendor\033[0m\n"
$(Q)adb shell 'su -c "mount -o rw,remount /vendor"'
@printf "\033[0;31m COPYING TO PHONE\033[0m %s => /sdcard/%s\n" $< $<
$(Q)adb push $< /sdcard/ >> log/adb.log 2>> log/adb.log
@printf "\033[0;31m COPYING\033[0m /sdcard/fw_bcmdhd.bin => /vendor/firmware/fw_bcm43455_hw.bin\n"
$(Q)adb shell 'su -c "cp /sdcard/fw_bcmdhd.bin /vendor/firmware/fw_bcm43455_hw.bin"'
@printf "\033[0;31m COPYING\033[0m /sdcard/fw_bcm43455_hw.bin => /vendor/firmware/fw_bcm43455_hw.bin\n"
$(Q)adb shell 'su -c "cp /sdcard/fw_bcm43455_hw.bin /vendor/firmware/fw_bcm43455_hw.bin"'
@printf "\033[0;31m RELOADING FIRMWARE\033[0m\n"
$(Q)adb shell 'su -c "ifconfig wlan0 down && ifconfig wlan0 up"'

Expand All @@ -173,24 +173,24 @@ install-original: $(FW_PATH)/$(RAM_FILE)
$(Q)adb shell 'su -c "mount -o rw,remount /vendor"'
@printf "\033[0;31m COPYING TO PHONE\033[0m %s => /sdcard/%s\n" $< $<
$(Q)adb push $< /sdcard/ >> log/adb.log 2>> log/adb.log
@printf "\033[0;31m COPYING\033[0m /sdcard/fw_bcmdhd.bin => /vendor/firmware/fw_bcm43455_hw.bin\n"
$(Q)adb shell 'su -c "cp /sdcard/fw_bcmdhd.bin /vendor/firmware/fw_bcm43455_hw.bin"'
@printf "\033[0;31m COPYING\033[0m /sdcard/fw_bcm43455_hw.bin => /vendor/firmware/fw_bcm43455_hw.bin\n"
$(Q)adb shell 'su -c "cp /sdcard/fw_bcm43455_hw.bin /vendor/firmware/fw_bcm43455_hw.bin"'
@printf "\033[0;31m RELOADING FIRMWARE\033[0m\n"
$(Q)adb shell 'su -c "ifconfig wlan0 down && ifconfig wlan0 up"'

backup-firmware: FORCE
adb shell 'su -c "cp /vendor/firmware/fw_bcmdhd.bin /sdcard/fw_bcmdhd.orig.bin"'
adb pull /sdcard/fw_bcmdhd.orig.bin
adb shell 'su -c "cp /vendor/firmware/fw_bcm43455_hw.bin /sdcard/fw_bcm43455_hw.orig.bin"'
adb pull /sdcard/fw_bcm43455_hw.orig.bin

install-backup: fw_bcmdhd.orig.bin
install-backup: fw_bcm43455_hw.orig.bin
adb shell 'su -c "mount -o rw,remount /system"' && \
adb push $< /sdcard/ && \
adb shell 'su -c "cp /sdcard/fw_bcmdhd.bin /vendor/firmware/fw_bcm43455_hw.bin"'
adb shell 'su -c "cp /sdcard/fw_bcm43455_hw.bin /vendor/firmware/fw_bcm43455_hw.bin"'
adb shell 'su -c "ifconfig wlan0 down && ifconfig wlan0 up"'

clean-firmware: FORCE
@printf "\033[0;31m CLEANING\033[0m\n"
$(Q)rm -fr fw_bcmdhd.bin obj gen log src/ucode_compressed.c src/templateram.c
$(Q)rm -fr fw_bcm43455_hw.bin obj gen log src/ucode_compressed.c src/templateram.c

clean: clean-firmware
$(Q)rm -f BUILD_NUMBER
Expand Down
24 changes: 12 additions & 12 deletions patches/bcm43455/7_45_77_0_hw/rom_extraction/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CFLAGS= \
-Iinclude \
-I$(FW_PATH)

all: fw_bcmdhd.bin
all: fw_bcm43455_hw.bin

init: FORCE
$(Q)if ! test -f BUILD_NUMBER; then echo 0 > BUILD_NUMBER; fi
Expand Down Expand Up @@ -63,7 +63,7 @@ gen/nexmon.ld: gen/nexmon2.pre $(OBJS)

gen/nexmon.mk: gen/nexmon2.pre $(OBJS) $(FW_PATH)/definitions.mk
@printf "\033[0;31m GENERATING MAKE FILE\033[0m gen/nexmon.pre => %s\n" $@
$(Q)printf "fw_bcmdhd.bin: gen/patch.elf FORCE\n" > $@
$(Q)printf "fw_bcm43455_hw.bin: gen/patch.elf FORCE\n" > $@
$(Q)sort gen/nexmon2.pre | \
gawk -v src_file=gen/patch.elf -f $(NEXMON_ROOT)/buildtools/scripts/nexmon.mk.1.awk | \
gawk -v ramstart=$(RAMSTART) -f $(NEXMON_ROOT)/buildtools/scripts/nexmon.mk.2.awk >> $@
Expand All @@ -86,7 +86,7 @@ gen/flashpatches.mk: gen/nexmon2.pre $(OBJS) $(FW_PATH)/definitions.mk
-v fp_config_base_ptr_2=$(FP_CONFIG_BASE_PTR_2) \
-v fp_config_end_ptr_2=$(FP_CONFIG_END_PTR_2) \
-v ramstart=$(RAMSTART) \
-v out_file=fw_bcmdhd.bin \
-v out_file=fw_bcm43455_hw.bin \
-v src_file=gen/patch.elf \
-f $(NEXMON_ROOT)/buildtools/scripts/flashpatches.mk.awk > $@

Expand All @@ -102,7 +102,7 @@ gen/patch.elf: patch.ld gen/nexmon.ld gen/flashpatches.ld gen/memory.ld $(OBJS)
@printf "\033[0;31m LINKING OBJECTS\033[0m => %s (details: log/linker.log, log/linker.err)\n" $@
$(Q)$(CC)ld -T $< -o $@ --gc-sections --print-gc-sections -M >>log/linker.log 2>>log/linker.err

fw_bcmdhd.bin: init gen/patch.elf $(FW_PATH)/$(RAM_FILE) gen/nexmon.mk gen/flashpatches.mk
fw_bcm43455_hw.bin: init gen/patch.elf $(FW_PATH)/$(RAM_FILE) gen/nexmon.mk gen/flashpatches.mk
$(Q)cp $(FW_PATH)/$(RAM_FILE) $@
@printf "\033[0;31m APPLYING FLASHPATCHES\033[0m gen/flashpatches.mk => %s (details: log/flashpatches.log)\n" $@
$(Q)make -f gen/flashpatches.mk >>log/flashpatches.log 2>>log/flashpatches.log
Expand Down Expand Up @@ -150,7 +150,7 @@ ifndef NEXMON_SETUP_ENV
$(error run 'source setup_env.sh' first in the repository\'s root directory)
endif

dump-rom: fw_bcmdhd.bin
dump-rom: fw_bcm43455_hw.bin
@printf "\033[0;31m COPYING TO PHONE\033[0m %s => /sdcard/%s\n" $< $<
$(Q)adb push $< /sdcard/ >> log/adb.log 2>> log/adb.log
@printf "\033[0;31m Stopping wifi service and killing wpa_supplicant\033[0m\n"
Expand All @@ -160,8 +160,8 @@ dump-rom: fw_bcmdhd.bin
$(Q)adb shell 'su -c "killall wpa_supplicant"'
$(Q)adb shell 'su -c "mv /system/bin/wpa_supplicant /system/bin/wpa_supplicant.backup"'
$(Q)adb shell 'su -c "killall wpa_supplicant"'
@printf "\033[0;31m LOADING FIRMWARE\033[0m /sdcard/fw_bcmdhd.bin\n"
$(Q)adb shell 'su -c "dhdutil download /sdcard/fw_bcmdhd.bin"'
@printf "\033[0;31m LOADING FIRMWARE\033[0m /sdcard/fw_bcm43455_hw.bin\n"
$(Q)adb shell 'su -c "dhdutil download /sdcard/fw_bcm43455_hw.bin"'
@printf "\033[0;31m DUMPING ROM\033[0m ROM => /sdcard/rom.bin\n"
$(Q)adb shell 'su -c "dhdutil membytes -r 0x199000 $(ROMSIZE) > /sdcard/rom.bin"'
@printf "\033[0;31m PULLING\033[0m /sdcard/rom.bin => rom.bin\n"
Expand All @@ -174,18 +174,18 @@ dump-rom: fw_bcmdhd.bin
$(Q)cp rom.bin $(NEXMON_ROOT)/firmwares/bcm43455/rom.bin

backup-firmware: FORCE
adb shell 'su -c "cp /vendor/firmware/fw_bcmdhd.bin /sdcard/fw_bcmdhd.orig.bin"'
adb pull /sdcard/fw_bcmdhd.orig.bin
adb shell 'su -c "cp /vendor/firmware/fw_bcm43455_hw.bin /sdcard/fw_bcm43455_hw.orig.bin"'
adb pull /sdcard/fw_bcm43455_hw.orig.bin

install-backup: fw_bcmdhd.orig.bin
install-backup: fw_bcm43455_hw.orig.bin
adb shell 'su -c "mount -o rw,remount /system"' && \
adb push $< /sdcard/ && \
adb shell 'su -c "cp /sdcard/fw_bcmdhd.bin /vendor/firmware/fw_bcmdhd.bin"'
adb shell 'su -c "cp /sdcard/fw_bcm43455_hw.bin /vendor/firmware/fw_bcm43455_hw.bin"'
adb shell 'su -c "ifconfig wlan0 down && ifconfig wlan0 up"'

clean-firmware: FORCE
@printf "\033[0;31m CLEANING\033[0m\n"
$(Q)rm -fr fw_bcmdhd.bin obj gen log src/ucode_compressed.c src/templateram.c
$(Q)rm -fr fw_bcm43455_hw.bin obj gen log src/ucode_compressed.c src/templateram.c

clean: clean-firmware
$(Q)rm -f BUILD_NUMBER rom.bin
Expand Down

0 comments on commit 213a304

Please sign in to comment.