Skip to content

Commit 930573f

Browse files
committed
[readme][script][docker] Remove support for RPi
1 parent 778c52c commit 930573f

File tree

4 files changed

+5
-108
lines changed

4 files changed

+5
-108
lines changed

README.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
# OpenJDK for ev3dev-lang-java
2-
A custom build of OpenJDK 9 & 10 for LEGO Mindstorms compatible bricks supported by ev3dev:
2+
Custom build of OpenJDK providing Java support for ev3dev on the following devices:
33

4-
* EV3, featuring a ARM926EJ-S CPU
5-
* Raspberry Pi 1, featuring a ARM1176JZF-S CPU
6-
* Raspberry Pi 2, featuring a Cortex-A7 CPU
7-
* Raspberry Pi 3, featuring a Cortex-A53 CPU
4+
* LEGO Mindstorms EV3, featuring a ARM926EJ-S CPU
85

96
Builds for older boards should work on newer boards, the performance might just be a bit lower.
107

@@ -44,8 +41,7 @@ The output consists of these parts:
4441
1. Install [Docker](https://docs.docker.com/engine/installation/) for your operating system.
4542
2. Build the jdk cross-compilation OS:
4643
```sh
47-
sudo docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile.armel system # ONLY FOR EV3
48-
sudo docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile.armhf system # ONLY FOR RPI1. RPI2 & RPI3
44+
sudo docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile.armel system
4945
```
5046
3. Build the jdk cross-compilation environment:
5147
```sh
@@ -63,13 +59,11 @@ Please change the `$BUILD_DIRECTORY` to a valid path.
6359
```
6460
export JDKVER=9 # OpenJDK 9
6561
export JDKVER=10 # OpenJDK 10
66-
export JDKVER=dev # OpenJDK Master+dev (to-be OpenJDK 11 at the time of writing)
62+
export JDKVER=11 # OpenJDK 11
63+
export JDKVER=12 # OpenJDK 12
6764
export JDKVM=zero # Use Zero interpreter
6865
export JDKVM=client # Use ARM32 JIT
6966
export JDKPLATFORM=ev3 # Use EV3 build flags
70-
export JDKPLATFORM=rpi1 # Use RPi1 build flags
71-
export JDKPLATFORM=rpi2 # Use RPi2 build flags
72-
export JDKPLATFORM=rpi3 # Use RPi3 build flags
7367
```
7468
6. Before we can start the build process, Boot JDK must be downloaded:
7569
```

scripts/build.sh

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ fi
4242
# configure the build
4343
echo "[BUILD] Configuring Java for target '$JDKPLATFORM'"
4444

45-
4645
if [ "$JDKPLATFORM" == "ev3" ]; then
4746
bash ./configure --with-boot-jdk="$HOSTJDK" \
4847
--openjdk-target=arm-linux-gnueabi \
@@ -61,28 +60,6 @@ if [ "$JDKPLATFORM" == "ev3" ]; then
6160
NM="arm-linux-gnueabi-gcc-nm" \
6261
BUILD_AR="gcc-ar" \
6362
BUILD_NM="gcc-nm"
64-
65-
# Raspberry Pis
66-
elif [ "$JDKPLATFORM" == "rpi1" ] ||
67-
[ "$JDKPLATFORM" == "rpi2" ] ||
68-
[ "$JDKPLATFORM" == "rpi3" ]; then
69-
bash ./configure --with-boot-jdk="$HOSTJDK" \
70-
--openjdk-target=arm-linux-gnueabihf \
71-
--with-abi-profile="arm-$JDKPLATFORM" \
72-
--enable-headless-only \
73-
--with-freetype-lib=/usr/lib/arm-linux-gnueabihf \
74-
--with-freetype-include=/usr/include \
75-
--with-jvm-variants="$HOTSPOT_VARIANT" \
76-
--with-extra-cflags="-w -Wno-error" \
77-
--with-extra-cxxflags="-w -Wno-error" \
78-
--with-version-string="$JAVA_VERSION" \
79-
--without-softfloat \
80-
--with-cacerts-file="$CACERTFILE" \
81-
--with-debug-level=release \
82-
AR="arm-linux-gnueabihf-gcc-ar" \
83-
NM="arm-linux-gnueabihf-gcc-nm" \
84-
BUILD_AR="gcc-ar" \
85-
BUILD_NM="gcc-nm"
8663
fi
8764

8865
# start the build

scripts/config.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,11 @@ fi
135135
if [ "$JDKPLATFORM" == "ev3" ]; then
136136
SFLT_NEEDED=true
137137

138-
# Raspberry Pi 1
139-
elif [ "$JDKPLATFORM" == "rpi1" ]; then
140-
SFLT_NEEDED=false
141-
142-
# Raspberry Pi 2
143-
elif [ "$JDKPLATFORM" == "rpi2" ]; then
144-
SFLT_NEEDED=false
145-
146-
# Raspberry Pi 3
147-
elif [ "$JDKPLATFORM" == "rpi3" ]; then
148-
SFLT_NEEDED=false
149-
150138
# invalid or unset platform
151139
else
152140
echo "Error! Please specify JDK platform to compile via the JDKPLATFORM environment variable." >&2
153141
echo "Acceptable values:" >&2
154142
echo "JDKPLATFORM=ev3" >&2
155-
echo "JDKPLATFORM=rpi1" >&2
156-
echo "JDKPLATFORM=rpi2" >&2
157-
echo "JDKPLATFORM=rpi3" >&2
158143
exit 1
159144
fi
160145

system/Dockerfile.armhf

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)