diff --git a/versal2.mk b/versal2.mk
index 6ed3b77..1dedf3a 100644
--- a/versal2.mk
+++ b/versal2.mk
@@ -8,6 +8,8 @@
 override COMPILE_S_USER		:= 64
 override COMPILE_S_KERNEL	:= 64
 
+PLATFORM = AMD Versal Gen 2
+
 # Network support related packages:
 BR2_PACKAGE_DHCPCD	?= y
 BR2_PACKAGE_ETHTOOL	?= y
@@ -22,7 +24,15 @@
 BR2_PACKAGE_LIBOPENSSL_BIN	?= y
 BR2_PACKAGE_LIBP11	?= y
 
-PLATFORM = AMD Versal Gen 2
+# Busybox
+BR2_PACKAGE_BUSYBOX_WATCHDOG    ?= y
+
+# Target specific
+BR2_TARGET_GENERIC_ISSUE	?= "OP-TEE embedded distrib for $(PLATFORM)"
+BR2_TARGET_GENERIC_GETTY_PORT   ?= "console"
+BR2_TARGET_ROOTFS_EXT2		?= y
+
+# OP-TEE
 OPTEE_OS_PLATFORM = versal2
 OPTEE_OS_COMMON_EXTRA_FLAGS ?= CFG_PKCS11_TA=y CFG_USER_TA_TARGET_pkcs11=ta_arm64 O=out/arm
 
@@ -161,10 +171,6 @@
 # Buildroot
 ################################################################################
 
-BR2_TARGET_GENERIC_ISSUE	?= "OP-TEE embedded distrib for $(PLATFORM)"
-BR2_TARGET_ROOTFS_EXT2	?= y
-BR2_PACKAGE_BUSYBOX_WATCHDOG	?= y
-
 buildroot_mkimg: buildroot
 	mkdir -p $(BINARIES_PATH)
 	$(MKIMAGE_PATH)/mkimage -A arm \