diff --git a/[refs] b/[refs]
index 64353e440a76..e1469fcc6c6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66ae45604c90f25397294099cdb214f642471327
+refs/heads/master: d159e571cb81a75d50f84fc4b716edee636f6858
diff --git a/trunk/arch/unicore32/Kconfig.debug b/trunk/arch/unicore32/Kconfig.debug
index ae2ec334c3c6..1a3626239843 100644
--- a/trunk/arch/unicore32/Kconfig.debug
+++ b/trunk/arch/unicore32/Kconfig.debug
@@ -44,18 +44,4 @@ config DEBUG_OCD
 	  Say Y here if you want the debug print routines to direct their
 	  output to the UniCore On-Chip-Debugger channel using CP #1.
 
-config DEBUG_OCD_BREAKPOINT
-	bool "Breakpoint support via On-Chip-Debugger"
-	depends on DEBUG_OCD
-
-config DEBUG_UART
-	int "Kernel low-level debugging messages via serial port"
-	depends on DEBUG_LL
-	range 0 1
-	default "0"
-	help
-	  Choice for UART for kernel low-level using PKUnity UARTS,
-	  should be between zero and one. The port must have been
-	  initialised by the boot-loader before use.
-
 endmenu