cfi_flash: Use __func__ macro instead of function name

[u-boot] / include / configs / nokia_rx51.h

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 20b8c345f06620210d4852f547b1e64c54e48904..00509e8508ade5df9d7d6161cfe28bb75f53c649 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -82,12 +82,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
-/* USB */
-#define CONFIG_USB_MUSB_UDC
-#define CONFIG_USB_MUSB_HCD
-#define CONFIG_USB_OMAP3
-#define CONFIG_TWL4030_USB
-
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
 #define CONFIG_USBD_VENDORID           0x0421
@@ -164,15 +158,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define MTDIDS_DEFAULT                 "onenand0=onenand"
-#define MTDPARTS_DEFAULT               "mtdparts=onenand:" \
-               __stringify(PART1_SIZE) PART1_SUFF "(" PART1_NAME ")ro," \
-               __stringify(PART2_SIZE) PART2_SUFF "(" PART2_NAME ")," \
-               __stringify(PART3_SIZE) PART3_SUFF "(" PART3_NAME ")," \
-               __stringify(PART4_SIZE) PART4_SUFF "(" PART4_NAME ")," \
-               __stringify(PART5_SIZE) PART5_SUFF "(" PART5_NAME ")," \
-               "-(" PART6_NAME ")"
-
 #endif
 
 /* Watchdog support */
@@ -198,13 +183,14 @@ int rx51_kp_tstc(struct stdio_dev *sdev);
 int rx51_kp_getc(struct stdio_dev *sdev);
 #endif
 
-#ifndef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT
-#endif
-
 /* Environment information */
+#ifdef CONFIG_MTDPARTS_DEFAULT
+#define MTDPARTS "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
+#else
+#define MTDPARTS
+#endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       MTDPARTS \
        "usbtty=cdc_acm\0" \
        "stdin=vga\0" \
        "stdout=vga\0" \