diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index ab62e71..1662844 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -146,6 +146,7 @@
 	"fdt_addr_r=0x02000000\0" \
 	"ramdisk_addr_r=0x02100000\0" \
 
+#ifndef TEGRA_DEVICE_SETTINGS
 #ifdef CONFIG_TEGRA_KEYBOARD
 #define STDIN_KBD_KBC ",tegra-kbc"
 #else
@@ -165,6 +166,8 @@
 	"stdout=serial\0" \
 	"stderr=serial\0" \
 
+#endif /* TEGRA_DEVICE_SETTINGS */
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	TEGRA_DEVICE_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \