8000 board: pluto & m2k: change mount points · analogdevicesinc/buildroot@1bfa9dc · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 1bfa9dc

Browse files
mhennerichcommodo
mhennerich
authored and
commodo
committed
board: pluto & m2k: change mount points
/mnt/msd for the mass storage device /mnt/jffs2 for the JFFS2 partition Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
1 parent f67bbf9 commit 1bfa9dc

File tree

7 files changed

+53
-41
lines changed

7 files changed

+53
-41
lines changed

‎board/m2k/S21misc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
source /etc/device_config
77

88
handle_calibration_files() {
9-
if [[ -s /mnt_jffs2/${CALIBFILENAME} ]]; then
10-
cp /mnt_jffs2/${CALIBFILENAME} /opt/${CALIBFILENAME}
11-
elif [[ -s /mnt_jffs2/${CALIBFILENAME_FACTORY} ]]; then
12-
cp /mnt_jffs2/${CALIBFILENAME_FACTORY} /opt/${CALIBFILENAME}
9+
if [[ -s /mnt/jffs2/${CALIBFILENAME} ]]; then
10+
cp /mnt/jffs2/${CALIBFILENAME} /opt/${CALIBFILENAME}
11+
elif [[ -s /mnt/jffs2/${CALIBFILENAME_FACTORY} ]]; then
12+
cp /mnt/jffs2/${CALIBFILENAME_FACTORY} /opt/${CALIBFILENAME}
1313
fi
1414
}
1515

‎board/m2k/device_config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ IFAC=/etc/network/interfaces
1010

1111
#update.sh
1212
TARGET=m2k
13-
FIRMWARE=/mnt/m2k.frm
13+
FIRMWARE=/mnt/msd/m2k.frm
1414
FRM_MAGIC="ITB M2k (ADALM-2000)"
1515
CALIBFILENAME=m2k-calib.ini
1616
CALIBFILENAME_FACTORY=m2k-calib-factory.ini

‎board/m2k/post-build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sed -i '/hostname/a\
1616

1717
sed -i -e '/::sysinit:\/bin\/hostname -F \/etc\/hostname/d' ${TARGET_DIR}/etc/inittab
1818

19-
grep -q mtd2 ${TARGET_DIR}/etc/fstab || echo "mtd2 /mnt_jffs2 jffs2 rw,noatime 0 0" >> ${TARGET_DIR}/etc/fstab
19+
grep -q mtd2 ${TARGET_DIR}/etc/fstab || echo "mtd2 /mnt/jffs2 jffs2 rw,noatime 0 0" >> ${TARGET_DIR}/etc/fstab
2020

2121
BOARD_DIR="$(dirname $0)"
2222
BOARD_NAME="$(basename ${BOARD_DIR})"
@@ -36,7 +36,8 @@ rm -f ${TARGET_DIR}/opt/boot.vfat
3636
rm -f ${TARGET_DIR}/etc/init.d/S99iiod
3737

3838
mkdir -p ${TARGET_DIR}/www/img
39-
mkdir -p ${TARGET_DIR}/mnt_jffs2
39+
mkdir -p ${TARGET_DIR}/mnt/jffs2
40+
mkdir -p ${TARGET_DIR}/mnt/msd
4041
mkdir -p ${TARGET_DIR}/etc/wpa_supplicant/
4142

4243
${INSTALL} -D -m 0755 ${BOARD_DIR}/../pluto/update.sh ${TARGET_DIR}/sbin/

‎board/pluto/S45msd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ case "$1" in
3030
echo -n "Starting MSD Daemon: "
3131
patch_html_page /www/index.html /www/img/version.js
3232
losetup /dev/loop7 $img -o 512
33-
mount /dev/loop7 /mnt
33+
mount /dev/loop7 /mnt/msd
3434

3535
if [ "$TARGET" == "m2k" ]; then
3636
cp /opt/${CALIBFILENAME} /mnt
37-
md5sum /mnt/${CALIBFILENAME} > /opt/${CALIBFILENAME}.md5
37+
md5sum /mnt/msd/${CALIBFILENAME} > /opt/${CALIBFILENAME}.md5
3838
fi
3939

40-
cp $CONF /mnt
41-
md5sum /mnt/config.txt > /opt/config.md5
40+
cp $CONF /mnt/msd
41+
md5sum /mnt/msd/config.txt > /opt/config.md5
4242

43-
cp -a /www/* /mnt/
44-
mv /mnt/index.html /mnt/info.html
45-
umount /mnt
43+
cp -a /www/* /mnt/msd
44+
mv /mnt/msd/index.html /mnt/msd/info.html
45+
umount /mnt/msd
4646
echo $img > $file
4747

4848
start-stop-daemon -S -b -q -m -p /var/run/update.pid -x /bin/sh -- /sbin/update.sh

‎board/pluto/device_config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ IFAC=/etc/network/interfaces
1010

1111
#update.sh
1212
TARGET=plutosdr
13-
FIRMWARE=/mnt/pluto.frm
13+
FIRMWARE=/mnt/msd/pluto.frm
1414
FRM_MAGIC="ITB PlutoSDR (ADALM-PLUTO)"
1515

‎board/pluto/post-build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ rm -f ${TARGET_DIR}/etc/init.d/S99iiod
4949
mkdir -p ${TARGET_DIR}/www/img
5050
mkdir -p ${TARGET_DIR}/etc/wpa_supplicant/
5151
mkdir -p ${TARGET_DIR}/mnt/jffs2
52+
mkdir -p ${TARGET_DIR}/mnt/msd
5253

5354
${INSTALL} -D -m 0755 ${BOARD_DIR}/update.sh ${TARGET_DIR}/sbin/
5455
${INSTALL} -D -m 0755 ${BOARD_DIR}/update_frm.sh ${TARGET_DIR}/sbin/

‎board/pluto/update.sh

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
source /etc/device_config
44

55
file=/sys/kernel/config/usb_gadget/composite_gadget/functions/mass_storage.0/lun.0/file
6-
bootimage=/mnt/boot.frm
7-
conf=/mnt/config.txt
6+
bootimage=/mnt/msd/boot.frm
7+
conf=/mnt/msd/config.txt
88
img=/opt/vfat.img
99

1010
ini_parser() {
@@ -82,7 +82,7 @@ process_ini() {
8282
ini_parser $FILE "SYSTEM"
8383
ini_parser $FILE "USB_ETHERNET"
8484

85-
rm -f /mnt/SUCCESS_ENV_UPDATE /mnt/FAILED_INVALID_UBOOT_ENV /mnt/CAL_STATUS
85+
rm -f /mnt/msd/SUCCESS_ENV_UPDATE /mnt/msd/FAILED_INVALID_UBOOT_ENV /mnt/msd/CAL_STATUS
8686

8787

8888
fw_printenv qspiboot
@@ -102,9 +102,9 @@ process_ini() {
102102
fw_setenv -s /opt/fw_set.tmp
103103
rm /opt/fw_set.tmp
104104
flash_indication_off
105-
touch /mnt/SUCCESS_ENV_UPDATE
105+
touch /mnt/msd/SUCCESS_ENV_UPDATE
106106
else
107-
touch /mnt/FAILED_INVALID_UBOOT_ENV
107+
touch /mnt/msd/FAILED_INVALID_UBOOT_ENV
108108
fi
109109

110110
ini_parser $FILE "ACTIONS"
@@ -121,20 +121,29 @@ process_ini() {
121121

122122
if [ "$diagnostic_report" == "1" ]
123123
then
124-
make_diagnostic_report /mnt/diagnostic_report
124+
make_diagnostic_report /mnt/msd/diagnostic_report
125125
fi
126126

127127
if [ "$calibrate" -gt "70000000" ]
128128
then
129-
calibrate $calibrate > /mnt/CAL_STATUS
129+
calibrate $calibrate > /mnt/msd/CAL_STATUS
130+
fi
131+
132+
echo here_1: > /mnt/msd/status
133+
134+
if [ "$revert_passwd" == "1" ]
135+
then
136+
echo here $revert_passwd >> /mnt/msd/status
137+
rm -f /mnt/jffs2/etc/passwd /mnt/jffs2/etc/group /mnt/jffs2/etc/password.md5 /mnt/jffs2/etc/shadow 2>&1 >> /mnt/msd/status
138+
echo here_2: >> /mnt/msd/status
130139
fi
131140

132141
md5sum $FILE > /opt/config.md5
133142
}
134143

135144
handle_boot_frm () {
136145
FILE="$1"
137-
rm -f /mnt/BOOT_SUCCESS /mnt/BOOT_FAILED /mnt/FAILED_MTD_PARTITION_ERROR /mnt/FAILED_BOOT_CHSUM_ERROR
146+
rm -f /mnt/msd/BOOT_SUCCESS /mnt/msd/BOOT_FAILED /mnt/msd/FAILED_MTD_PARTITION_ERROR /mnt/msd/FAILED_BOOT_CHSUM_ERROR
138147
head -3 /proc/mtd | sed 's/00010000/00001000/g' > /opt/mtd
139148

140149
md5=`tail -c 33 ${FILE}`
@@ -153,14 +162,14 @@ handle_boot_frm () {
153162
diff -w /opt/mtd /opt/mtd-info.txt
154163
if [ $? -eq 0 ]; then
155164
flash_indication_on
156-
dd if=/opt/boot.bin of=/dev/mtdblock0 bs=64k && dd if=/opt/u-boot-env.bin of=/dev/mtdblock1 bs=64k && do_reset=1 && touch /mnt/BOOT_SUCCESS || touch /mnt/BOOT_FAILED
165+
dd if=/opt/boot.bin of=/dev/mtdblock0 bs=64k && dd if=/opt/u-boot-env.bin of=/dev/mtdblock1 bs=64k && do_reset=1 && touch /mnt/msd/BOOT_SUCCESS || touch /mnt/msd/BOOT_FAILED
157166
flash_indication_off
158167
else
159-
cat /opt/mtd /opt/mtd-info.txt > /mnt/FAILED_MTD_PARTITION_ERROR
168+
cat /opt/mtd /opt/mtd-info.txt > /mnt/msd/FAILED_MTD_PARTITION_ERROR
160169
do_reset=0
161170
fi
162171
else
163-
echo $md5 $frm > /mnt/FAILED_BOOT_CHSUM_ERROR
172+
echo $md5 $frm > /mnt/msd/FAILED_BOOT_CHSUM_ERROR
164173
do_reset=0
165174
fi
166175

@@ -172,18 +181,18 @@ handle_boot_frm () {
172181
handle_frimware_frm () {
173182
FILE="$1"
174183
MAGIC="$2"
175-
rm -f /mnt/SUCCESS /mnt/FAILED /mnt/FAILED_FIRMWARE_CHSUM_ERROR
184+
rm -f /mnt/msd/SUCCESS /mnt/msd/FAILED /mnt/msd/FAILED_FIRMWARE_CHSUM_ERROR
176185
md5=`tail -c 33 ${FILE}`
177186
head -c -33 ${FILE} > /opt/firmware.frm
178187
FRM_SIZE=`cat /opt/firmware.frm | wc -c | xargs printf "%X\n"`
179188
frm=`md5sum /opt/firmware.frm | cut -d ' ' -f 1`
180189
if [ "$frm" = "$md5" ]
181190
then
182191
flash_indication_on
183-
grep -q "${MAGIC}" /opt/firmware.frm && dd if=/opt/firmware.frm of=/dev/mtdblock3 bs=64k && fw_setenv fit_size ${FRM_SIZE} && do_reset=1 && touch /mnt/SUCCESS || touch /mnt/FAILED
192+
grep -q "${MAGIC}" /opt/firmware.frm && dd if=/opt/firmware.frm of=/dev/mtdblock3 bs=64k && fw_setenv fit_size ${FRM_SIZE} && do_reset=1 && touch /mnt/msd/SUCCESS || touch /mnt/msd/FAILED
184193
flash_indication_off
185194
else
186-
echo $frm $md5 > /mnt/FAILED_FIRMWARE_CHSUM_ERROR
195+
echo $frm $md5 > /mnt/msd/FAILED_FIRMWARE_CHSUM_ERROR
187196
do_reset=0
188197
fi
189198

@@ -200,12 +209,13 @@ do
200209
then
201210
do_reset=0
202211
losetup /dev/loop7 $img -o 512
203-
mount /dev/loop7 /mnt
212+
mkdir -p /mnt/msd
213+
mount /dev/loop7 /mnt/msd
204214

205-
if [[ -s /mnt/$TARGET-fw-*.zip ]]
215+
if [[ -s /mnt/msd/$TARGET-fw-*.zip ]]
206216
then
207-
mv /mnt/$TARGET-fw-*.zip /opt/
208-
unzip -o /opt/$TARGET-fw-*.zip *.frm -d /mnt
217+
mv /mnt/msd/$TARGET-fw-*.zip /opt/
218+
unzip -o /opt/$TARGET-fw-*.zip *.frm -d /mnt/msd
209219
rm /opt/$TARGET-fw-*.zip
210220
fi
211221

@@ -222,19 +232,19 @@ do
222232
md5sum -c /opt/config.md5 || process_ini $conf
223233

224234
if [ "$TARGET" == "m2k" ]; then
225-
if [[ -s /mnt/${CALIBFILENAME} ]]; then
235+
if [[ -s /mnt/msd/${CALIBFILENAME} ]]; then
226236
md5sum -c /opt/${CALIBFILENAME}.md5
227237
if [ $? -ne 0 ]; then
228-
cp /mnt/${CALIBFILENAME} /mnt_jffs2/${CALIBFILENAME} && do_reset=1
238+
cp /mnt/msd/${CALIBFILENAME} /mnt/jffs2/${CALIBFILENAME} && do_reset=1
229239
fi
230240

231241
else
232-
rm /mnt_jffs2/${CALIBFILENAME} && do_reset=1
242+
rm /mnt/jffs2/${CALIBFILENAME} && do_reset=1
233243
fi
234244

235-
if [[ -s /mnt/${CALIBFILENAME_FACTORY} ]]; then
236-
if [[ ! -s /mnt_jffs2/${CALIBFILENAME_FACTORY} ]]; then
237-
cp /mnt/${CALIBFILENAME_FACTORY} /mnt_jffs2/${CALIBFILENAME_FACTORY}
245+
if [[ -s /mnt/msd/${CALIBFILENAME_FACTORY} ]]; then
246+
if [[ ! -s /mnt/jffs2/${CALIBFILENAME_FACTORY} ]]; then
247+
cp /mnt/msd/${CALIBFILENAME_FACTORY} /mnt/jffs2/${CALIBFILENAME_FACTORY}
238248
do_reset=1
239249
fi
240250
fi
@@ -245,9 +255,9 @@ do
245255
reset
246256
fi
247257

248-
cp /opt/ipaddr-* /mnt 2>/dev/null
258+
cp /opt/ipaddr-* /mnt/msd 2>/dev/null
249259

250-
umount /mnt
260+
umount /mnt/msd
251261
#losetup -d /dev/loop7
252262
echo $img > $file
253263
flash_indication_off

0 commit comments

Comments
 (0)
0