diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a9e6cfa..f26e9d6 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -100,12 +100,12 @@
 #define CONFIG_SYS_FLASH_BASE	0xe8000000
 #define CONFIG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | CONFIG_SYS_FLASH_BASE)
 
-#define CONFIG_SYS_NOR_CSPR_EXT	(0xf)
-#define CONFIG_SYS_NOR_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
+#define CFG_SYS_NOR_CSPR_EXT	(0xf)
+#define CFG_SYS_NOR_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
 				CSPR_PORT_SIZE_16 | \
 				CSPR_MSEL_NOR | \
 				CSPR_V)
-#define CONFIG_SYS_NOR_AMASK	IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK	IFC_AMASK(128*1024*1024)
 
 /*
  * TDM Definition
@@ -113,18 +113,18 @@
 #define T1040_TDM_QUIRK_CCSR_BASE	0xfe000000
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR	CSOR_NAND_TRHZ_80
-#define CONFIG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR	CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
 				FTIM0_NOR_TEADC(0x5) | \
 				FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
 				FTIM1_NOR_TRAD_NOR(0x1A) |\
 				FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
 				FTIM2_NOR_TCH(0x4) | \
 				FTIM2_NOR_TWPH(0x0E) | \
 				FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3	0x0
+#define CFG_SYS_NOR_FTIM3	0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
@@ -221,23 +221,23 @@
 #define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NAND_FTIM1
 #define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NAND_FTIM2
 #define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT		CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR1		CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR1_EXT		CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR1		CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK1		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3		CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR0_EXT		CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR0		CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT		CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1		CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1		CFG_SYS_NAND_AMASK