Revert "Sync Wio lr1110 refresh with master (#4288)"

This reverts commit 5cc8ca59a3.

Revert "Sync Wio lr1110 refresh with master (#4251)"

This reverts commit d97e6b86b8.

Revert "update SD_FLASH_SIZE to 0x27000 (#4232)"

This reverts commit 2df8093fef.

bin/build-nrf52.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION=$(bin/buildinfo.py long)
-SHORT_VERSION=$(bin/buildinfo.py short)
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
 
 OUTDIR=release/
 
@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update
+platformio pkg update 
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*
@@ -23,27 +23,14 @@ basename=firmware-$1-$VERSION
 
 pio run --environment $1 # -v
 SRCELF=.pio/build/$1/firmware.elf
-cp $SRCELF $OUTDIR/$basename.elf
-
-echo "Generating NRF52 dfu file"
 DFUPKG=.pio/build/$1/firmware.zip
+cp $SRCELF $OUTDIR/$basename.elf
 cp $DFUPKG $OUTDIR/$basename-ota.zip
 
 echo "Generating NRF52 uf2 file"
 SRCHEX=.pio/build/$1/firmware.hex
+bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
 
-# if WM1110 target, merge hex with softdevice 7.3.0
-if (echo $1 | grep -q "wio-sdk-wm1110"); then
-	echo "Merging with softdevice"
-	sudo chmod +x ./bin/mergehex
-	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
-	SRCHEX=.pio/build/$1/$basename.hex
-	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
-	cp $SRCHEX $OUTDIR
-	cp bin/*.uf2 $OUTDIR
-else
-	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
-	cp bin/device-install.* $OUTDIR
-	cp bin/device-update.* $OUTDIR
-	cp bin/*.uf2 $OUTDIR
-fi
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR
+cp bin/*.uf2 $OUTDIR