summaryrefslogtreecommitdiff
path: root/include/configs/rpi_b.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2014-02-05 20:49:21 -0700
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-21 15:30:15 +0100
commit29235b73373f28f2516d2eafbf6ec76ecf8051a3 (patch)
treead4d27596b6050baf27247cb59919100b65c2800 /include/configs/rpi_b.h
parentb81fdb04868e21693f5dfe9242ff6f49fcfe5a93 (diff)
ARM: rpi_b: convert to use distro defaults
Modify the rpi_b board to include the "distro defaults" header, so that all the config options distros expect are enabled. Remove any #defines that enable the same options from the rpi_b.h. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'include/configs/rpi_b.h')
-rw-r--r--include/configs/rpi_b.h29
1 files changed, 13 insertions, 16 deletions
diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h
index 976ceaa9c1..202c9c309f 100644
--- a/include/configs/rpi_b.h
+++ b/include/configs/rpi_b.h
@@ -147,37 +147,34 @@
#define CONFIG_BOOTDELAY 2
/* Shell */
-#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_MAXARGS 8
#define CONFIG_SYS_PROMPT "U-Boot> "
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_COMMAND_HISTORY
-#define CONFIG_AUTO_COMPLETE
/* Commands */
#include <config_cmd_default.h>
-#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_GPIO
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT
-/* Some things don't make sense on this HW or yet */
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SAVEENV
-/* Device tree support for bootm/bootz */
-#define CONFIG_OF_LIBFDT
+/* Device tree support */
#define CONFIG_OF_BOARD_SETUP
/* ATAGs support for bootm/bootz */
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG
#define CONFIG_INITRD_TAG
+#include <config_distro_defaults.h>
+
+/* Some things don't make sense on this HW or yet */
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
+#undef CONFIG_CMD_SAVEENV
+#undef CONFIG_CMD_DHCP
+#undef CONFIG_CMD_MII
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_PING
+
#endif