Skip to content

Commit 5c84b4b

Browse files
author
Emmanuel Florent
committed
remove sdkconfig feature not needed
1 parent 40a7aad commit 5c84b4b

File tree

3 files changed

+9
-28
lines changed

3 files changed

+9
-28
lines changed

pycom-docker-fw-build/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM ubuntu:bionic
22

3-
RUN apt-get update && apt-get -y install wget git build-essential python \
4-
python-serial libncurses5 libncurses5-dev flex bison gperf && \
3+
RUN apt-get update && apt-get -y install wget git build-essential python python-serial && \
54
mkdir /opt/frozen/ && cd /opt && \
65
wget -q https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz && \
76
tar -xzvf xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz && \

pycom-docker-fw-build/README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,16 @@ where board in `WIPY LOPY SIPY GPY FIPY LOPY4` and your-project-version-code is
1111

1212
### example:
1313

14-
For building against a specific revision (ex:v1.20.0.rc7 idf_v3.1) you can use:
14+
If you have your MicroPython project in the current directory `.` just type:
15+
1516
```
16-
sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw build FIPY myproject v1.20.0.rc7 idf_v3.1
17+
sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw build LOPY4 myproject
1718
```
18-
19-
### Altering Espressif IDF options:
20-
21-
Have a file `sdkconfig.defaults` similar to https://github.com/pycom/pycom-esp-idf/blob/master/examples/wifi/scan/sdkconfig in your local frozen directory (ex: .), then use the same command:
22-
19+
For building against a specific revision (ex:v1.20.0.rc0 idf_v3.1) you can use:
2320
```
24-
sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw build FIPY myproject v1.20.0.rc7 idf_v3.1
21+
sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw build FIPY myproject v1.20.0.rc0 idf_v3.1
2522
```
2623

27-
Beginning the build the `sdkconfig.defaults` overrides.
2824

2925
### note:
3026

pycom-docker-fw-build/assets/build

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,39 +51,25 @@ function prepare_dev() {
5151
cd /opt/pycom-esp-idf
5252
git checkout $2
5353
git submodule update --init
54-
55-
if [ -f /opt/frozen/sdkconfig.defaults ]
56-
then
57-
cd examples/wifi/scan/
58-
cp /opt/frozen/sdkconfig.defaults sdkconfig.defaults
59-
make defconfig
60-
make bootloader
61-
make -j4 all
62-
echo "IDF build options:"
63-
cat sdkconfig
64-
fi
6554
fi
6655
}
6756

6857
function build() {
6958
BOARD=$1
7059
PROJECT=$2
60+
export PATH=$PATH:/opt/xtensa-esp32-elf/bin/
61+
export IDF_PATH=/opt/pycom-esp-idf
7162
board=`echo "$BOARD" | tr '[:upper:]' '[:lower:]'`
7263
cd /opt/pycom-micropython-sigfox/esp32/ &&
7364
make clean BOARD=$BOARD &&
7465
cd ../mpy-cross && make clean && make && cd ../esp32 &&
7566
cp /opt/frozen/*.py ./frozen/Base/ &&
7667
mv ./frozen/Base/main.py ./frozen/Base/_main.py
77-
make TARGET=boot COPY_IDF_LIBS=1 BOARD=$BOARD RELEASE_DIR=/tmp
78-
cat /opt/pycom-esp-idf/examples/wifi/scan/sdkconfig.defaults
79-
make release COPY_IDF_LIBS=1 BOARD=$BOARD RELEASE_DIR=/tmp
68+
make release BOARD=$BOARD RELEASE_DIR=/tmp
8069
mv /tmp/*.tar.gz /opt/frozen/$board-firmware-$PROJECT.tar.gz
8170
echo "Firmware $board-firmware-$PROJECT.tar.gz ready !"
8271
}
8372

84-
export PATH=$PATH:/opt/xtensa-esp32-elf/bin/
85-
export IDF_PATH=/opt/pycom-esp-idf
86-
8773
[[ $boards =~ (^|[[:space:]])$1($|[[:space:]]) ]] &&
8874
echo "#goinvent " ||
8975
usage

0 commit comments

Comments
 (0)