Convert CONFIG_KIRKWOOD_PCIE_INIT et al to Kconfig
This converts the following to Kconfig: CONFIG_KIRKWOOD_EGIGA_INIT CONFIG_KIRKWOOD_PCIE_INIT CONFIG_KIRKWOOD_RGMII_PAD_1V8 CONFIG_KM_DISABLE_PCIE Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
604c62f511
commit
432243cee1
@ -121,6 +121,18 @@ endchoice
|
||||
config SYS_SOC
|
||||
default "kirkwood"
|
||||
|
||||
config KIRKWOOD_RGMII_PAD_1V8
|
||||
bool "Configures the I/O voltage of the pads connected gigabit interface to 1.8V"
|
||||
default y
|
||||
|
||||
config KIRKWOOD_EGIGA_INIT
|
||||
bool "Enable GbePort0/1 for kernel"
|
||||
default y
|
||||
|
||||
config KIRKWOOD_PCIE_INIT
|
||||
bool "Enable PCIe Port0 for kernel"
|
||||
default y
|
||||
|
||||
source "board/Marvell/openrd/Kconfig"
|
||||
source "board/Marvell/dreamplug/Kconfig"
|
||||
source "board/Synology/ds109/Kconfig"
|
||||
|
@ -23,9 +23,6 @@
|
||||
#endif /* CONFIG_KW88F6281 */
|
||||
|
||||
#include <asm/arch/soc.h>
|
||||
#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
|
||||
#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
|
||||
#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */
|
||||
|
||||
#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE
|
||||
#define MV_UART_CONSOLE_BASE KW_UART0_BASE
|
||||
|
@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_128M16_1.cfg"
|
||||
CONFIG_SYS_TEXT_BASE=0x07d00000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x400
|
||||
CONFIG_TARGET_KM_KIRKWOOD=y
|
||||
# CONFIG_KIRKWOOD_PCIE_INIT is not set
|
||||
CONFIG_ENV_SIZE=0x2000
|
||||
CONFIG_ENV_OFFSET=0x0
|
||||
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
|
||||
|
@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage.cfg"
|
||||
CONFIG_SYS_TEXT_BASE=0x07d00000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x400
|
||||
CONFIG_TARGET_KM_KIRKWOOD=y
|
||||
# CONFIG_KIRKWOOD_PCIE_INIT is not set
|
||||
CONFIG_ENV_SIZE=0x2000
|
||||
CONFIG_ENV_OFFSET=0x0
|
||||
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
|
||||
|
@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_256M8_1.cfg"
|
||||
CONFIG_SYS_TEXT_BASE=0x07d00000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x400
|
||||
CONFIG_TARGET_KM_KIRKWOOD=y
|
||||
# CONFIG_KIRKWOOD_PCIE_INIT is not set
|
||||
CONFIG_ENV_SIZE=0x2000
|
||||
CONFIG_ENV_OFFSET=0xC0000
|
||||
CONFIG_ENV_SECT_SIZE=0x10000
|
||||
|
@ -9,10 +9,6 @@
|
||||
/* additions for new ARM relocation support */
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x00000000
|
||||
|
||||
#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
|
||||
#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */
|
||||
#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
|
||||
|
||||
/*
|
||||
* NS16550 Configuration
|
||||
*/
|
||||
|
@ -9,10 +9,6 @@
|
||||
/* additions for new ARM relocation support */
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x00000000
|
||||
|
||||
#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
|
||||
#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */
|
||||
#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
|
||||
|
||||
/*
|
||||
* NS16550 Configuration
|
||||
*/
|
||||
|
@ -23,7 +23,6 @@
|
||||
/* KM_KIRKWOOD */
|
||||
#if defined(CONFIG_KM_KIRKWOOD)
|
||||
#define CONFIG_HOSTNAME "km_kirkwood"
|
||||
#define CONFIG_KM_DISABLE_PCIE
|
||||
|
||||
/* KM_KIRKWOOD_PCI */
|
||||
#elif defined(CONFIG_KM_KIRKWOOD_PCI)
|
||||
@ -34,7 +33,6 @@
|
||||
/* KM_KIRKWOOD_128M16 */
|
||||
#elif defined(CONFIG_KM_KIRKWOOD_128M16)
|
||||
#define CONFIG_HOSTNAME "km_kirkwood_128m16"
|
||||
#define CONFIG_KM_DISABLE_PCIE
|
||||
|
||||
/* KM_NUSA */
|
||||
#elif defined(CONFIG_KM_NUSA)
|
||||
@ -44,7 +42,6 @@
|
||||
/* KMCOGE5UN */
|
||||
#elif defined(CONFIG_KM_COGE5UN)
|
||||
#define CONFIG_HOSTNAME "kmcoge5un"
|
||||
#define CONFIG_KM_DISABLE_PCIE
|
||||
|
||||
/* KM_SUSE2 */
|
||||
#elif defined(CONFIG_KM_SUSE2)
|
||||
@ -118,8 +115,4 @@
|
||||
MVGBE_SET_MII_SPEED_TO_100)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_KM_DISABLE_PCIE
|
||||
#undef CONFIG_KIRKWOOD_PCIE_INIT
|
||||
#endif
|
||||
|
||||
#endif /* _CONFIG_KM_KIRKWOOD */
|
||||
|
Loading…
Reference in New Issue
Block a user