Skip to content

Commit

Permalink
scripts: switch to {cross}readelf
Browse files Browse the repository at this point in the history
It's done to avoid using host readelf, which may be incompatible (especially on macOS) with gcc version currently supported on Phoenix-RTOS.

JIRA: CI-313
  • Loading branch information
damianloew committed Aug 23, 2023
1 parent 77ee698 commit d280df5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions scripts/mkimg-app-stm32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ i=$i+4
SYSPAGESZ=$i
for app in $@; do
SYSPAGESZ=$SYSPAGESZ+20
SEGMENTS=`readelf -l $app | grep "LOAD" | wc -l`
SEGMENTS=`${CROSS}readelf -l $app | grep "LOAD" | wc -l`

for (( j=1; j<=$SEGMENTS; j++ )); do
SYSPAGESZ=$SYSPAGESZ+24
Expand All @@ -56,25 +56,25 @@ for app in $@; do
echo "Proccessing $app"
k=0

ENTRY=$((`readelf -l $app | grep "Entry point" | awk '{ print $3 }'`))
ENTRY=$((`${CROSS}readelf -l $app | grep "Entry point" | awk '{ print $3 }'`))
ENTRY=$(($ENTRY+$OFFSET-$APP_START-$(($i-$k))))
printf "%08x %08x\n" $i $ENTRY >> syspage.hex #entry
i=$i+4
k=$k+4

SEGMENTS=`readelf -l $app | grep "LOAD" | wc -l`
SEGMENTS=`${CROSS}readelf -l $app | grep "LOAD" | wc -l`
printf "%08x %08x\n" $i $SEGMENTS >> syspage.hex #hdrssz
i=$i+4
k=$k+4

printf "%08x " $i >> syspage.hex
echo `readelf -S $app | grep ".got" | awk '{ print $5 }'` >> syspage.hex
echo `${CROSS}readelf -S $app | grep ".got" | awk '{ print $5 }'` >> syspage.hex
i=$i+4
k=$k+4

printf "%08x " $i >> syspage.hex
echo -n "00" >> syspage.hex
echo `readelf -S $app | grep ".got" | awk '{ print $7 }'` >> syspage.hex
echo `${CROSS}readelf -S $app | grep ".got" | awk '{ print $7 }'` >> syspage.hex
i=$i+4
k=$k+4

Expand All @@ -87,7 +87,7 @@ for app in $@; do
k=$k+4

for (( j=1; j<=$SEGMENTS; j++ )); do
LINE=`readelf -l $app | grep "LOAD" | sed -n ${j}p`
LINE=`${CROSS}readelf -l $app | grep "LOAD" | sed -n ${j}p`

VIRTADDR=`echo $LINE | awk '{ print $3 }'`
PHYSADDR=`echo $LINE | awk '{ print $4 }'`
Expand Down
4 changes: 2 additions & 2 deletions scripts/mkimg-stm32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ STRIP_OPT="--strip-unneeded -R .symtab"

SIZE_PAGE=$((0x800))
PAGE_MASK=$((~($SIZE_PAGE-1)))
KERNEL_END=$(($(readelf -l $KERNELELF | awk '/LOAD/ && /R E/ { print $6 }')))
KERNEL_END=$(($(${CROSS}readelf -l $KERNELELF | awk '/LOAD/ && /R E/ { print $6 }')))
FLASH_START=$((0x08000000))
SYSPAGE_OFFSET=$((2048))

Expand Down Expand Up @@ -112,7 +112,7 @@ for arg in "$@"; do
cp $app tmp.elf
${CROSS}strip $STRIP_OPT tmp.elf
printf "App %s @offset 0x%08x\n" $app $OFFSET
ELFOFFS=$(($(readelf -l $app | awk '/LOAD/ && /R E/ { print $2 }')))
ELFOFFS=$(($(${CROSS}readelf -l $app | awk '/LOAD/ && /R E/ { print $2 }')))
printf "add-symbol-file %s 0x%08x\n" $(realpath $app) $((OFFSET + $FLASH_START + $ELFOFFS)) >> $GDB_SYM_FILE
dd if=tmp.elf of=$OUTPUT bs=1 seek=$OFFSET 2>/dev/null
OFFSET=$((($OFFSET + $(wc -c < tmp.elf) + $SIZE_PAGE - 1)&$PAGE_MASK))
Expand Down

0 comments on commit d280df5

Please sign in to comment.