Merge branch 'mr13u_led_polarity_fix' into dev

[oweals/u-boot_mod.git] / u-boot / include / configs / ap121.h

diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h
index 2d36efc2dd433b0f498c658b5dcfe0a933ec61ee..4e3c55024303c852fb82ce91025b7ec60f49ac53 100644 (file)
--- a/u-boot/include/configs/ap121.h
+++ b/u-boot/include/configs/ap121.h
@@ -2,8 +2,8 @@
  * This file contains the configuration parameters for the AP121 (AR9331) board.
  */
 
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __AP121_CONFIG_H
+#define __AP121_CONFIG_H
 
 #include <configs/ar7240.h>
 #include <config.h>
@@ -385,52 +385,35 @@
  */
 #if defined(CONFIG_FOR_DLINK_DIR505_A1)
 
-       #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \
-                                                        CFG_CMD_PING   | \
-                                                        CFG_CMD_FLASH  | \
-                                                        CFG_CMD_NET    | \
-                                                        CFG_CMD_RUN    | \
-                                                        CFG_CMD_DATE   | \
-                                                        CFG_CMD_ECHO   | \
-                                                        CFG_CMD_BOOTD  | \
-                                                        CFG_CMD_ITEST  | \
-                                                        CFG_CMD_IMI)
-
-#elif defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) || \
-      defined(CONFIG_FOR_DRAGINO_V2) || \
-      defined(CONFIG_FOR_MESH_POTATO_V2) || \
-      defined(CONFIG_FOR_BLACK_SWIFT_BOARD)
-
-       #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \
-                                                        CFG_CMD_DHCP   | \
-                                                        CFG_CMD_PING   | \
-                                                        CFG_CMD_FLASH  | \
-                                                        CFG_CMD_NET    | \
-                                                        CFG_CMD_RUN    | \
-                                                        CFG_CMD_DATE   | \
-                                                        CFG_CMD_SNTP   | \
-                                                        CFG_CMD_ECHO   | \
-                                                        CFG_CMD_BOOTD  | \
-                                                        CFG_CMD_ITEST  | \
-                                                        CFG_CMD_IMI    | \
-                                                        CFG_CMD_ENV    | \
-                                                        CFG_CMD_LOADB)
+       #define CONFIG_CMD_MEMORY
+       #define CONFIG_CMD_PING
+       #define CONFIG_CMD_FLASH
+       #define CONFIG_CMD_NET
+       #define CONFIG_CMD_RUN
+       #define CONFIG_CMD_DATE
+       #define CONFIG_CMD_ECHO
+       #define CONFIG_CMD_BOOTD
+       #define CONFIG_CMD_ITEST
+       #define CONFIG_CMD_IMI
 
 #else
 
-       #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \
-                                                        CFG_CMD_DHCP   | \
-                                                        CFG_CMD_PING   | \
-                                                        CFG_CMD_FLASH  | \
-                                                        CFG_CMD_NET    | \
-                                                        CFG_CMD_RUN    | \
-                                                        CFG_CMD_DATE   | \
-                                                        CFG_CMD_SNTP   | \
-                                                        CFG_CMD_ECHO   | \
-                                                        CFG_CMD_BOOTD  | \
-                                                        CFG_CMD_ITEST  | \
-                                                        CFG_CMD_ENV    | \
-                                                        CFG_CMD_LOADB)
+       #define CONFIG_CMD_MEMORY
+       #define CONFIG_CMD_DHCP
+       #define CONFIG_CMD_PING
+       #define CONFIG_CMD_FLASH
+       #define CONFIG_CMD_NET
+       #define CONFIG_CMD_RUN
+       #define CONFIG_CMD_DATE
+       #define CONFIG_CMD_SNTP
+       #define CONFIG_CMD_ECHO
+       #define CONFIG_CMD_BOOTD
+       #define CONFIG_CMD_ITEST
+       #define CONFIG_CMD_IMI
+       #define CONFIG_CMD_ENV
+       #define CONFIG_CMD_LOADB
+       #define CONFIG_CMD_BUTTON
+       #define CONFIG_CMD_SLEEP
 
 #endif
 
@@ -560,8 +543,7 @@
                                                                                        "echo OK!; " \
                                                                                "else " \
                                                                                        "echo ERROR! Server not reachable!; " \
-                                                                               "fi\0" \
-                                                                       SILENT_ENV_VARIABLE
+                                                                               "fi\0"
 
 #define CFG_ATHRS26_PHY                                1
 #define CFG_AG7240_NMACS                       2
@@ -677,6 +659,4 @@
                                                                                                         0x0000FFE0)
 #endif
 
-#include <cmd_confdefs.h>
-
-#endif /* __CONFIG_H */
+#endif /* __AP121_CONFIG_H */