Merge "SpaceCast: Move the stack/malloc base to 0x0900X000"
diff --git a/arch/arm/configs/spacecast_defconfig b/arch/arm/configs/spacecast_defconfig
index 810bfc0..07779bc 100644
--- a/arch/arm/configs/spacecast_defconfig
+++ b/arch/arm/configs/spacecast_defconfig
@@ -42,6 +42,7 @@
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
CONFIG_NET_TFTP_PUSH=y
+# CONFIG_DRIVER_SERIAL_FAST_UART is not set
CONFIG_NET_COMCERTO=y
CONFIG_NET_COMCERTO_2000=y
CONFIG_I2C=y
diff --git a/common/Kconfig b/common/Kconfig
index 54749c2..62ffd14 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -78,6 +78,7 @@
config DEVELOPER_BAREBOX
depends on COMCERTO_BOOTLOADER
+ select DRIVER_SERIAL_FAST_UART
bool "Enable developer barebox build"
help
A developer barebox build skips most of the production setup;
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7c6a1b6..4ff524c 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -18,7 +18,7 @@
default y
bool "i.MX serial driver"
-config DRIVER_FAST_UART
+config DRIVER_SERIAL_FAST_UART
depends on ARCH_COMCERTO
default y
bool "Comcerto Fast UART driver"
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index e90a5ef..3438626 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -17,6 +17,4 @@
obj-$(CONFIG_DRIVER_SERIAL_PL010) += serial_pl010.o
obj-$(CONFIG_DRIVER_SERIAL_S3C24X0) += serial_s3c24x0.o
obj-$(CONFIG_DRIVER_SERIAL_ALTERA) += serial_altera.o
-#obj-$(CONFIG_DRIVER_SERIAL_FAST_UART) += fast_uart.o
-#FIXME: No one is setting the CONFIG_DRIVER_SERIAL_FAST_UART. It's not defined in Kconfig also.Need to be fixed
-obj-y += fast_uart.o
+obj-$(CONFIG_DRIVER_SERIAL_FAST_UART) += fast_uart.o
