GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move CK804_PCI_E_X and CK804B_PCI_E_X defines (which have been 4 by 

default on all boards) into Kconfig.

Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6109 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Jonathan Kollasch 2010-11-21 22:55:46 +00:00 committed by Jonathan A. Kollasch
parent 7b997053eb
commit fae0d6c12b
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/southbridge/nvidia/ck804/Kconfig
View File

@ -5,30 +5,42 @@ config SOUTHBRIDGE_NVIDIA_CK804
select IOAPIC select IOAPIC
select TINY_BOOTBLOCK select TINY_BOOTBLOCK
if SOUTHBRIDGE_NVIDIA_CK804
config BOOTBLOCK_SOUTHBRIDGE_INIT config BOOTBLOCK_SOUTHBRIDGE_INIT
string string
default "southbridge/nvidia/ck804/bootblock.c" if SOUTHBRIDGE_NVIDIA_CK804 default "southbridge/nvidia/ck804/bootblock.c"
config ID_SECTION_OFFSET config ID_SECTION_OFFSET
hex hex
default 0x80 if SOUTHBRIDGE_NVIDIA_CK804 default 0x80
config EHCI_BAR config EHCI_BAR
hex hex
default 0xfef00000 if SOUTHBRIDGE_NVIDIA_CK804 default 0xfef00000
config EHCI_DEBUG_OFFSET config EHCI_DEBUG_OFFSET
hex hex
default 0x98 if SOUTHBRIDGE_NVIDIA_CK804 default 0x98
config CK804_USE_NIC config CK804_USE_NIC
bool bool
default n if SOUTHBRIDGE_NVIDIA_CK804 default n
config CK804_USE_ACI config CK804_USE_ACI
bool bool
default n if SOUTHBRIDGE_NVIDIA_CK804 default n
config CK804_PCI_E_X
int
default 4
config CK804B_PCI_E_X
int
default 4
config CK804_NUM config CK804_NUM
int int
default 1 if SOUTHBRIDGE_NVIDIA_CK804 default 1
endif

16
src/southbridge/nvidia/ck804/ck804_early_setup.c
View File

@ -56,16 +56,15 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
#define SYSCTRL_REG_POS 0x64 #define SYSCTRL_REG_POS 0x64
/* /*
* Values for CONFIG_CK804_PCI_E_X and CONFIG_CK804B_PCI_E_X.
* Apparently some sort of lane configuration.
*
* 16 1 1 2 :0 * 16 1 1 2 :0
* 8 8 2 2 :1 * 8 8 2 2 :1
* 8 8 4 :2 * 8 8 4 :2
* 8 4 4 4 :3 * 8 4 4 4 :3
* 16 4 :4 * 16 4 :4
*/ */
#ifndef CK804_PCI_E_X
#define CK804_PCI_E_X 4
#endif
#if CONFIG_CK804_NUM > 1 #if CONFIG_CK804_NUM > 1
#define CK804B_ANACTRL_IO_BASE (ANACTRL_IO_BASE + 0x8000) #define CK804B_ANACTRL_IO_BASE (ANACTRL_IO_BASE + 0x8000)
@ -73,9 +72,6 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
#ifndef CK804B_BUSN #ifndef CK804B_BUSN
#define CK804B_BUSN 0x80 #define CK804B_BUSN 0x80
#endif #endif
#ifndef CK804B_PCI_E_X
#define CK804B_PCI_E_X 4
#endif
#endif #endif
#define CK804_CHIP_REV 3 #define CK804_CHIP_REV 3
@ -258,9 +254,9 @@ static void ck804_early_setup(void)
RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000, RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000,
RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CK804_PCI_E_X << 4) | (1 << 8), RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CONFIG_CK804_PCI_E_X << 4) | (1 << 8),
#if CONFIG_CK804_NUM > 1 #if CONFIG_CK804_NUM > 1
RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CK804B_PCI_E_X << 4) | (1 << 8), RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CONFIG_CK804B_PCI_E_X << 4) | (1 << 8),
#endif #endif
RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)), RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)),

17
src/southbridge/nvidia/ck804/ck804_early_setup_car.c
View File

@ -54,20 +54,15 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
#define SYSCTRL_REG_POS 0x64 #define SYSCTRL_REG_POS 0x64
/* /*
* Values for CONFIG_CK804_PCI_E_X and CONFIG_CK804B_PCI_E_X.
* Apparently some sort of lane configuration.
*
* 16 1 1 2 :0 * 16 1 1 2 :0
* 8 8 2 2 :1 * 8 8 2 2 :1
* 8 8 4 :2 * 8 8 4 :2
* 8 4 4 4 :3 * 8 4 4 4 :3
* 16 4 :4 * 16 4 :4
*/ */
#ifndef CK804_PCI_E_X
#define CK804_PCI_E_X 4
#endif
#ifndef CK804B_PCI_E_X
#define CK804B_PCI_E_X 4
#endif
#define CK804_CHIP_REV 3 #define CK804_CHIP_REV 3
@ -199,7 +194,7 @@ static void ck804_early_setup(unsigned ck804_num, unsigned *busn,
RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000, RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000,
RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CK804_PCI_E_X << 4) | (1 << 8), RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CONFIG_CK804_PCI_E_X << 4) | (1 << 8),
//SYSCTRL //SYSCTRL
RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)), RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)),
@ -275,7 +270,7 @@ static void ck804_early_setup(unsigned ck804_num, unsigned *busn,
/* This line doesn't exist in the non-CAR version. */ /* This line doesn't exist in the non-CAR version. */
RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000, RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000,
RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CK804B_PCI_E_X << 4) | (1 << 8), RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CONFIG_CK804B_PCI_E_X << 4) | (1 << 8),
#if CONFIG_CK804_USE_NIC #if CONFIG_CK804_USE_NIC
RES_PCI_IO, PCI_ADDR(0, 0xa, 0, 0xf8), 0xffffffbf, 0x00000040, RES_PCI_IO, PCI_ADDR(0, 0xa, 0, 0xf8), 0xffffffbf, 0x00000040,