summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/cli_hush.c1
-rw-r--r--drivers/ddr/marvell/axp/ddr3_axp_config.h2
-rw-r--r--include/configs/P1010RDB.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h1
-rw-r--r--include/configs/s5p4418_nanopi2.h2
5 files changed, 0 insertions, 7 deletions
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 1467ff81b35..a80b84756bb 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -112,7 +112,6 @@
#define applet_name "hush"
#include "standalone.h"
#define hush_main main
-#undef CONFIG_FEATURE_SH_FANCY_PROMPT
#define BB_BANNER
#endif
#endif
diff --git a/drivers/ddr/marvell/axp/ddr3_axp_config.h b/drivers/ddr/marvell/axp/ddr3_axp_config.h
index ab09e72623a..04bb4ed8f34 100644
--- a/drivers/ddr/marvell/axp/ddr3_axp_config.h
+++ b/drivers/ddr/marvell/axp/ddr3_axp_config.h
@@ -59,12 +59,10 @@
/* Marvell boards specific configurations */
#if defined(DB_78X60_PCAC)
-#undef CONFIG_SPD_EEPROM
#define STATIC_TRAINING
#endif
#if defined(DB_78X60_AMC)
-#undef CONFIG_SPD_EEPROM
#undef DRAM_ECC
#define DRAM_ECC 1
#endif
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 2267a7a9c8b..afb602c5bce 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -309,7 +309,6 @@ extern unsigned long get_sdram_size(void);
#endif
/* Serial Port */
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
#define CFG_SYS_NS16550_CLK get_bus_freq(0)
#define CFG_SYS_BAUDRATE_TABLE \
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c05904a813d..74627b2e630 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -302,7 +302,6 @@
* open - index 2
* shorted - index 1
*/
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
#define CFG_SYS_NS16550_CLK get_bus_freq(0)
#define CFG_SYS_BAUDRATE_TABLE \
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index e071d4da5e8..b4b2dbd0386 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -66,8 +66,6 @@
/*-----------------------------------------------------------------------
* High Level System Configuration
*/
-/* Not used: not need IRQ/FIQ stuff */
-#undef CONFIG_USE_IRQ
/* decrementer freq: 1ms ticks */
/*-----------------------------------------------------------------------