 -	"netargs=setenv bootargs console=${console},${baudrate} ${smp} " \
 -		"root=/dev/nfs " \
 -		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++	"hdmi_txterm=0x0005\0" \
++	"hdmi_vlev=0x01ad\0" \
++	"bootargs_base=console=${console},${baudrate} txterm=${hdmi_txterm} vlev=${hdmi_vlev} oops=panic panic=5 ${smp} rootwait consoleblank=0\0" \
++	"set_bootargs_base=setenv bootargs_base=console=${console},${baudrate} txterm=${hdmi_txterm} vlev=${hdmi_vlev} oops=panic panic=5 ${smp} rootwait consoleblank=0\0" \
 +	"sdloadbootscript=" \
 +		"ext2load mmc ${sdcarddev}:${mmcpart} ${scriptaddr} ${script};\0" \
 +	"sdloadfdt=ext2load mmc ${sdcarddev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \

 
 #define CONFIG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \
@@ -178,79 +171,46 @@
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \

-	"\0" \
-	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+	CONFIG_EMMC_DEV_SET \
 	"smp=" CONFIG_SYS_NOSMP "\0"\
-	"mmcargs=setenv bootargs console=${console},${baudrate} ${smp} " \
