Skip to content

Openbmc/helium/4.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simon-fan wants to merge 5 commits into
base: openbmc/helium/4.1
Choose a base branch
from
Open

Openbmc/helium/4.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b8e164
Add CONFIG_MAVERICKS flag
simon-fan May 22, 2018
972d7e1
Add CONFIG_MAVERICKS compiler flag.
simon-fan May 22, 2018
26e0f79
Add CONFIG_MAVERICKS compiler flag.
simon-fan May 22, 2018
84c2bc3
Add MAVERICKS flag.
simon-fan May 22, 2018
62ab615
Add CONFIG_MAVERICKS compiler flag.
simon-fan May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion arch/arm/mach-aspeed/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ config WEDGE
config WEDGE100
bool "Facebook Wedge100"

config MAVERICKS
bool "Barefoot Mavericks"

config MINIPACK
bool "Facebook Minipack"

Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/plat-aspeed/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/plat-aspeed/dev-eth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;

Expand Down
9 changes: 5 additions & 4 deletions arch/arm/plat-aspeed/dev-spi-fb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/faraday/ftgmac100.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down