diff --git a/arch/arm/boards/optimus/leds.h b/arch/arm/boards/optimus/leds.h
new file mode 100644
index 0000000..609eb2e
--- /dev/null
+++ b/arch/arm/boards/optimus/leds.h
@@ -0,0 +1,9 @@
+#ifndef __OPTIMUS_LEDS_H
+#define __OPTIMUS_LEDS_H
+
+#include <mach/gpio.h>
+
+#define GPIO_BLUE_LED                   GPIO_12
+#define GPIO_RED_LED                    GPIO_13
+
+#endif /* __OPTIMUS_LEDS_H */
diff --git a/arch/arm/boards/optimus/optimus.c b/arch/arm/boards/optimus/optimus.c
index 17beae0..df19053 100644
--- a/arch/arm/boards/optimus/optimus.c
+++ b/arch/arm/boards/optimus/optimus.c
@@ -56,6 +56,7 @@
 #include <tpm_lite/tlcl.h>
 #include <environment.h>
 #include <recovery.h>
+#include "leds.h"
 
 #define PHY_DEVICE      "phy0"
 
@@ -439,10 +440,10 @@
 	 * GPIO 48: Power enable for high power wifi 11AC 4.2V PA, needs to be
 	 *          set high
 	 */
-	comcerto_gpio_enable_output(GPIO_12|GPIO_13);
+	comcerto_gpio_enable_output(GPIO_BLUE_LED|GPIO_RED_LED);
 	/* Turn blue LED off, red LED on, to indicate the uloader is running. */
-	comcerto_gpio_set_0(GPIO_12);
-	comcerto_gpio_set_1(GPIO_13);
+	comcerto_gpio_set_0(GPIO_BLUE_LED);
+	comcerto_gpio_set_1(GPIO_RED_LED);
 
 	comcerto_gpio_enable_output(GPIO_14|GPIO_15);
 	comcerto_gpio_set_1(GPIO_14|GPIO_15);
@@ -471,8 +472,8 @@
 #endif
 #ifdef	CONFIG_COMCERTO_BOOTLOADER
 	/* Turn blue LED off, red LED on, to indicate the bootloader is running. */
-	comcerto_gpio_set_0(GPIO_12);
-	comcerto_gpio_set_1(GPIO_13);
+	comcerto_gpio_set_0(GPIO_BLUE_LED);
+	comcerto_gpio_set_1(GPIO_RED_LED);
 #endif
 
 	sdram_dev.size = get_ddr_config_size();
diff --git a/commands/otp_stability_test.c b/commands/otp_stability_test.c
index eee3fc2..49cd8f3 100644
--- a/commands/otp_stability_test.c
+++ b/commands/otp_stability_test.c
@@ -36,6 +36,8 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 
+#include "../arch/arm/boards/optimus/leds.h"
+
 #define OTP_KEY_SIZE_BYTES	256
 #define OTP_HEADER_OFFSET_BITS	32
 
@@ -59,28 +61,28 @@
 }
 
 static void flash_led_forever(void) {
-	/* Turn off both blue (GPIO_12) and red (GPIO_13) leds to start. */
-	comcerto_gpio_set_0(GPIO_12);
-	comcerto_gpio_set_0(GPIO_13);
+	/* Turn off both blue and red leds to start. */
+	comcerto_gpio_set_0(GPIO_BLUE_LED);
+	comcerto_gpio_set_0(GPIO_RED_LED);
 
 	/* Flash the red LED continuously. */
 	while (true) {
 		mdelay(LED_BLINK_DELAY_MILLISECONDS);
-		comcerto_gpio_set_1(GPIO_13);
+		comcerto_gpio_set_1(GPIO_RED_LED);
 		if (ctrlc()) {
 			break;
 		}
 
 		mdelay(LED_BLINK_DELAY_MILLISECONDS);
-		comcerto_gpio_set_0(GPIO_13);
+		comcerto_gpio_set_0(GPIO_RED_LED);
 		if (ctrlc()) {
 			break;
 		}
 	}
 
 	/* Reset to barebox norm: red on, blue off. */
-	comcerto_gpio_set_0(GPIO_12);
-	comcerto_gpio_set_1(GPIO_13);
+	comcerto_gpio_set_0(GPIO_BLUE_LED);
+	comcerto_gpio_set_1(GPIO_RED_LED);
 }
 
 /*
@@ -190,4 +192,3 @@
 	.usage		= "perform OTP stability test",
 	BAREBOX_CMD_HELP(cmd_otp_stability_test_help)
 BAREBOX_CMD_END
-