diff --git a/boards.txt b/boards.txt
index a66ec14bac7..daa48a605e6 100644
--- a/boards.txt
+++ b/boards.txt
@@ -11755,7 +11755,7 @@ esp32-gateway.menu.Revision.RevC=Revision C or older
 esp32-gateway.menu.Revision.RevC.build.board=ESP32_GATEWAY_C
 esp32-gateway.menu.Revision.RevE=Revision E
 esp32-gateway.menu.Revision.RevE.build.board=ESP32_GATEWAY_E
-esp32-gateway.menu.Revision.RevF=Revision F
+esp32-gateway.menu.Revision.RevF=Revision F or newer
 esp32-gateway.menu.Revision.RevF.build.board=ESP32_GATEWAY_F
 
 esp32-gateway.build.f_cpu=240000000L
@@ -11770,6 +11770,8 @@ esp32-gateway.menu.FlashFreq.80.build.flash_freq=80m
 esp32-gateway.menu.FlashFreq.40=40MHz
 esp32-gateway.menu.FlashFreq.40.build.flash_freq=40m
 
+esp32-gateway.menu.UploadSpeed.921600=921600
+esp32-gateway.menu.UploadSpeed.921600.upload.speed=921600
 esp32-gateway.menu.UploadSpeed.115200=115200
 esp32-gateway.menu.UploadSpeed.115200.upload.speed=115200
 
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
index b2b6f065558..5dd5d7e0fd9 100644
--- a/variants/esp32-gateway/pins_arduino.h
+++ b/variants/esp32-gateway/pins_arduino.h
@@ -11,7 +11,7 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-#if	ARDUINO_ESP32_GATEWAY >= 'D'
+#if	defined (ARDUINO_ESP32_GATEWAY_E) || defined (ARDUINO_ESP32_GATEWAY_F)
 #define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
 #define ETH_PHY_POWER 5
 #endif
@@ -40,7 +40,7 @@ static const uint8_t A7 = 35;
 
 static const uint8_t T9 = 32;
 
-#if	ARDUINO_ESP32_GATEWAY >= 'F'
+#if	defined (ARDUINO_ESP32_GATEWAY_F)
 #define BOARD_HAS_1BIT_SDMMC
 #endif