cfi_flash: Use __func__ macro instead of function name

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

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 347aa7b3290b89c552cf43329ff0c55465147e16..eef16027a25ebc07caa2e6fdbb3a05c42daf834b 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -69,7 +69,6 @@
 
 #define CONFIG_SYS_MEMTEST_START 0x00010000    /* skip exception vectors */
 #define CONFIG_SYS_MEMTEST_END   0x1f000000    /* skip u-boot at top of RAM */
-#define CONFIG_PANIC_HANG      /* do not reset board on panic */
 
 /*
  * Config the L2 Cache as L2 SRAM
@@ -508,9 +507,6 @@
 #endif /* CONFIG_PCI */
 
 /* SATA */
-#define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1               CONFIG_SYS_MPC85xx_SATA1_ADDR
@@ -603,8 +599,6 @@
 #define CONFIG_CMDLINE_EDITING                 /* Command-line editing */
 #define CONFIG_AUTO_COMPLETE                   /* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
-#define CONFIG_SYS_MAXARGS     16              /* max number of command args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
 
 /*
  * For booting Linux, the board info and command line data