diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index acd18bd..e1c810f 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -13,4 +13,30 @@
         help
             Boolean used to flag whether to include NVIDIA GPU binary
 
+choice
+	prompt "HCODE version"
+	default BR2_HCODE_OP920_VERSION
+
+config BR2_HCODE_OP920_VERSION
+	bool "Use latest HCODE stable version (OP920)"
+
+config BR2_HCODE_LATEST_VERSION
+	bool "Use latest HCODE master"
+
+config BR2_HCODE_CUSTOM_VERSION
+	bool "Custom HCODE version"
+
+endchoice
+
+config BR2_HCODE_CUSTOM_VERSION_VALUE
+	string "HCODE version"
+	depends on BR2_HCODE_CUSTOM_VERSION
+
+config BR2_HCODE_VERSION
+	string
+	default "1b068da5e7532c03b43daea4dc268e7de9cd650d" if BR2_HCODE_LATEST_VERSION
+	default "a4ea84060888d68d179c48ace6d0b0cea20e8988" if BR2_HCODE_OP920_VERSION
+	default BR2_HCODE_CUSTOM_VERSION_VALUE \
+		if BR2_HCODE_CUSTOM_VERSION
+
 endif
diff --git a/openpower/package/hcode/hcode.mk b/openpower/package/hcode/hcode.mk
index 99816a3..f35a363 100644
--- a/openpower/package/hcode/hcode.mk
+++ b/openpower/package/hcode/hcode.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HCODE_VERSION ?= 1b068da5e7532c03b43daea4dc268e7de9cd650d
+HCODE_VERSION = $(call qstrip,$(BR2_HCODE_VERSION))
 HCODE_SITE = $(call github,open-power,hcode,$(HCODE_VERSION))
 
 HCODE_LICENSE = Apache-2.0