summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-22 16:41:25 -0400
committerTom Rini <trini@konsulko.com>2016-04-25 15:09:40 -0400
commit78d1e1d0a157c8b48ea19be6170b992745d30f38 (patch)
tree5d536a283e4e72c28f08a261435c9dff532f22b4 /arch
parent4d7100a61d6fe0652dd0e8b7b3cc31ad37483d64 (diff)
configs: Re-sync almost all of cmd/Kconfig
This syncs up the current cmd/Kconfig and include/configs/ files with the only exception being CMD_NAND. Due to how we have used this historically we need to take further care here when converting. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/arch-bcmcygnus/configs.h1
-rw-r--r--arch/blackfin/include/asm/config.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h
index 3c0716082a..fd51531360 100644
--- a/arch/arm/include/asm/arch-bcmcygnus/configs.h
+++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h
@@ -30,7 +30,6 @@
#define CONFIG_PHY_BROADCOM
#define CONFIG_PHY_RESET_DELAY 10000 /* PHY reset delay in us*/
-#define CONFIG_CMD_PING
#define CONFIG_CMD_MII
#endif /* __ARCH_CONFIGS_H */
diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index d2cf71bfaf..3d98a00e9b 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -138,9 +138,6 @@
#ifndef CONFIG_SYS_BOOTM_LEN
# define CONFIG_SYS_BOOTM_LEN 0x4000000
#endif
-#ifndef CONFIG_SYS_PROMPT
-# define CONFIG_SYS_PROMPT "bfin> "
-#endif
#ifndef CONFIG_SYS_CBSIZE
# define CONFIG_SYS_CBSIZE 1024
#elif defined(CONFIG_CMD_KGDB) && CONFIG_SYS_CBSIZE < 1024