diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h
index a8883d3..9268efb 100644
--- a/include/configs/rpi_b.h
+++ b/include/configs/rpi_b.h
@@ -80,7 +80,11 @@
 #define CONFIG_AUTO_COMPLETE
 
 /* Commands */
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
+#include "config_cmd_default.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
 
 #endif