diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig
index f37d9da0baa1db..cd7dd7c85195d7 100644
--- a/arch/arm/mach-aspeed/Kconfig
+++ b/arch/arm/mach-aspeed/Kconfig
@@ -212,6 +212,9 @@ config WEDGE
 config WEDGE100
         bool "Facebook Wedge100"
 
+config MAVERICKS
+        bool "Barefoot Mavericks"
+
 config MINIPACK
         bool "Facebook Minipack"
 
@@ -280,7 +283,7 @@ config AST_CONSOLE_UART_BASE
     hex "Console UART base address"
     default 0x1e783000 if CMM
     default 0x1e784000 if YAMP
-    default 0x1e78e000 if WEDGE || WEDGE100
+    default 0x1e78e000 if WEDGE || WEDGE100 || MAVERICKS
     default 0x1e783000 if MINIPACK
     default 0x1e784000 if FBTP
     default 0x1e784000 if FBY2
diff --git a/arch/arm/plat-aspeed/Makefile b/arch/arm/plat-aspeed/Makefile
index 55d9a0d6e11a39..8853e110f9e073 100644
--- a/arch/arm/plat-aspeed/Makefile
+++ b/arch/arm/plat-aspeed/Makefile
@@ -42,6 +42,11 @@ ifeq ($(CONFIG_WEDGE100), y)
   PLATFB = 1
 endif
 
+ifeq ($(CONFIG_MAVERICKS), y)
+  obj-y += dev-uart.o
+  PLATFB = 1
+endif
+
 ifeq ($(CONFIG_YAMP), y)
   obj-y += dev-uart.o
   PLATFB = 1
diff --git a/arch/arm/plat-aspeed/dev-eth.c b/arch/arm/plat-aspeed/dev-eth.c
index 7e28d004a6f743..d7368ad9b2c78d 100644
--- a/arch/arm/plat-aspeed/dev-eth.c
+++ b/arch/arm/plat-aspeed/dev-eth.c
@@ -45,7 +45,7 @@
 	defined(CONFIG_FBTTN) || defined(CONFIG_FBY2) || \
 	defined(CONFIG_YOSEMITE) || defined(CONFIG_MINIPACK) || \
 	defined(CONFIG_MINILAKETB) || defined(CONFIG_YAMP) || \
-	defined(CONFIG_GALAXY100)
+	defined(CONFIG_GALAXY100) || defined(CONFIG_MAVERICKS)
 #define DRVNAME "ftgmac100"
 #else
 #define DRVNAME "ast_gmac"
@@ -158,7 +158,7 @@ void __init ast_add_device_gmac(void)
 	// MAC specs.
 #if !defined(CONFIG_WEDGE) && !defined(CONFIG_WEDGE100) && \
     !defined(CONFIG_CMM) && !defined(CONFIG_MINIPACK) && \
-    !defined(CONFIG_GALAXY100)
+    !defined(CONFIG_GALAXY100) && !defined(CONFIG_MAVERICKS)
 
 	ast_eth0_data.DF_support = !isRevA0;
 
diff --git a/arch/arm/plat-aspeed/dev-spi-fb.c b/arch/arm/plat-aspeed/dev-spi-fb.c
index c155199daf3f9d..2bf4f3d0cf98b6 100644
--- a/arch/arm/plat-aspeed/dev-spi-fb.c
+++ b/arch/arm/plat-aspeed/dev-spi-fb.c
@@ -173,7 +173,7 @@ static struct platform_device ast_fmc_device = {
 };
 
 static struct platform_device ast_spi0_device = {
-#if defined CONFIG_WEDGE100 || defined CONFIG_MINIPACK
+#if defined CONFIG_WEDGE100 || defined CONFIG_MINIPACK || defined CONFIG_MAVERICKS
           .name           = "ast-spi",
           .id             = 1,
 #else
@@ -374,10 +374,10 @@ static struct spi_eeprom m95m02 = {
 #endif
 
 #if defined(CONFIG_FBTP)  || defined(CONFIG_LIGHTNING) || defined (CONFIG_WEDGE100) || defined (CONFIG_PWNEPTUNE) || \
-    defined(CONFIG_MINIPACK)
+    defined(CONFIG_MINIPACK) || defined (CONFIG_MAVERICKS)
 static struct spi_board_info ast_spi0_devices[] = {
     {
-#if defined(CONFIG_WEDGE100) || defined(CONFIG_MINIPACK)
+#if defined(CONFIG_WEDGE100) || defined(CONFIG_MINIPACK) || defined(CONFIG_MAVERICKS)
         .modalias           = "spidev",
         .chip_select        = 0,
         .max_speed_hz       = 33 * 1000 * 1000,
@@ -445,7 +445,8 @@ void __init ast_add_device_spi(void)
   } else {
     spi_register_board_info(ast_single_flash_fmc_devices, ARRAY_SIZE(ast_single_flash_fmc_devices));
   }
-#if defined(CONFIG_FBTP) || defined(CONFIG_LIGHTNING) || defined(CONFIG_WEDGE100) || defined(CONFIG_PWNEPTUNE)
+#if defined(CONFIG_FBTP) || defined(CONFIG_LIGHTNING) || defined(CONFIG_WEDGE100) || defined(CONFIG_PWNEPTUNE) \
+    || defined(CONFIG_MAVERICKS)
 	platform_device_register(&ast_spi0_device);
 	spi_register_board_info(ast_spi0_devices, ARRAY_SIZE(ast_spi0_devices));
 #elif defined(CONFIG_MINIPACK)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 687b0316c1b4b3..eec570503c32de 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -3240,7 +3240,7 @@ static int ftgmac100_open(struct net_device *netdev)
 #if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100) || \
     defined(CONFIG_CMM) || defined (CONFIG_PWNEPTUNE) || \
     defined(CONFIG_MINIPACK) || defined (CONFIG_GALAXY100) || \
-    defined(CONFIG_MINILAKETB)
+    defined(CONFIG_MINILAKETB)  || defined(CONFIG_MAVERICKS)
 	ftgmac100_start_hw(priv, 1000);
 #elif defined(CONFIG_FBTP)
 	ftgmac100_start_hw(priv, 100);