Clean up AMD romstage.c whitespace indent issues
Change-Id: I1713f1a3b548cb8e8ea5cf57eef95486ceb05ab9 Signed-off-by: Marc Jones <marcj303@gmail.com> Reviewed-on: http://review.coreboot.org/538 Tested-by: build bot (Jenkins) Reviewed-by: Vikram Narayanan <vikram186@gmail.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Stefan Reinauer
parent
db89ec975c
commit
c9ea327a45
@@ -74,7 +74,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
post_code(0x37);
|
post_code(0x37);
|
||||||
val = agesawrapper_amdinitreset();
|
val = agesawrapper_amdinitreset();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
|
|
||||||
post_code(0x38);
|
post_code(0x38);
|
||||||
@@ -83,21 +84,24 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
post_code(0x39);
|
post_code(0x39);
|
||||||
val = agesawrapper_amdinitearly();
|
val = agesawrapper_amdinitearly();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n");
|
||||||
|
|
||||||
post_code(0x40);
|
post_code(0x40);
|
||||||
val = agesawrapper_amdinitpost();
|
val = agesawrapper_amdinitpost();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n");
|
||||||
|
|
||||||
post_code(0x41);
|
post_code(0x41);
|
||||||
val = agesawrapper_amdinitenv();
|
val = agesawrapper_amdinitenv();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n");
|
||||||
|
|
||||||
@@ -114,4 +118,3 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
|
|
||||||
post_code(0x54); // Should never see this post code.
|
post_code(0x54); // Should never see this post code.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -27,7 +27,6 @@
|
|||||||
#include "SbEarly.h"
|
#include "SbEarly.h"
|
||||||
#include "agesawrapper.h"
|
#include "agesawrapper.h"
|
||||||
|
|
||||||
|
|
||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
@@ -59,9 +58,6 @@ u32 sbdn_sb900;
|
|||||||
|
|
||||||
static u32 get_bus_conf_done = 0;
|
static u32 get_bus_conf_done = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 status;
|
u32 status;
|
||||||
@@ -74,7 +70,8 @@ void get_bus_conf(void)
|
|||||||
|
|
||||||
get_bus_conf_done = 1;
|
get_bus_conf_done = 1;
|
||||||
|
|
||||||
printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - Start.\n");
|
printk(BIOS_DEBUG,
|
||||||
|
"Mainboard - Get_bus_conf.c - get_bus_conf - Start.\n");
|
||||||
/*
|
/*
|
||||||
* This is the call to AmdInitLate. It is really in the wrong place, conceptually,
|
* This is the call to AmdInitLate. It is really in the wrong place, conceptually,
|
||||||
* but functionally within the coreboot model, this is the best place to make the
|
* but functionally within the coreboot model, this is the best place to make the
|
||||||
@@ -92,7 +89,8 @@ void get_bus_conf(void)
|
|||||||
*/
|
*/
|
||||||
status = agesawrapper_amdinitlate();
|
status = agesawrapper_amdinitlate();
|
||||||
if (status) {
|
if (status) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n",
|
||||||
|
status);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitlate\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitlate\n");
|
||||||
|
|
||||||
@@ -106,7 +104,6 @@ void get_bus_conf(void)
|
|||||||
bus_type[i] = 0; /* default ISA bus. */
|
bus_type[i] = 0; /* default ISA bus. */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bus_type[0] = 1; /* pci */
|
bus_type[0] = 1; /* pci */
|
||||||
|
|
||||||
// bus_sb900[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
// bus_sb900[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
@@ -115,8 +112,6 @@ void get_bus_conf(void)
|
|||||||
/* sb900 */
|
/* sb900 */
|
||||||
dev = dev_find_slot(bus_sb900[0], PCI_DEVFN(sbdn_sb900 + 0x14, 4));
|
dev = dev_find_slot(bus_sb900[0], PCI_DEVFN(sbdn_sb900 + 0x14, 4));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (dev) {
|
if (dev) {
|
||||||
bus_sb900[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb900[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
|
|
||||||
@@ -127,9 +122,12 @@ void get_bus_conf(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
dev = dev_find_slot(bus_sb900[0], PCI_DEVFN(sbdn_sb900 + 0x14, i));
|
dev =
|
||||||
|
dev_find_slot(bus_sb900[0],
|
||||||
|
PCI_DEVFN(sbdn_sb900 + 0x14, i));
|
||||||
if (dev) {
|
if (dev) {
|
||||||
bus_sb900[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb900[2 + i] =
|
||||||
|
pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
|
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
|
||||||
bus_isa++;
|
bus_isa++;
|
||||||
}
|
}
|
||||||
@@ -137,10 +135,10 @@ void get_bus_conf(void)
|
|||||||
for (j = bus_sb900[2]; j < bus_isa; j++)
|
for (j = bus_sb900[2]; j < bus_isa; j++)
|
||||||
bus_type[j] = 1;
|
bus_type[j] = 1;
|
||||||
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
bus_isa = 10;
|
bus_isa = 10;
|
||||||
|
|
||||||
sb_Late_Post();
|
sb_Late_Post();
|
||||||
printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - End.\n");
|
printk(BIOS_DEBUG,
|
||||||
|
"Mainboard - Get_bus_conf.c - get_bus_conf - End.\n");
|
||||||
}
|
}
|
||||||
|
@@ -40,7 +40,6 @@
|
|||||||
|
|
||||||
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
|
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
|
||||||
|
|
||||||
|
|
||||||
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
||||||
{
|
{
|
||||||
u32 val;
|
u32 val;
|
||||||
@@ -48,7 +47,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
post_code(0x35);
|
post_code(0x35);
|
||||||
val = agesawrapper_amdinitmmio();
|
val = agesawrapper_amdinitmmio();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitmmio failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitmmio failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitmmio\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitmmio\n");
|
||||||
|
|
||||||
@@ -79,21 +79,24 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
post_code(0x36);
|
post_code(0x36);
|
||||||
val = agesawrapper_amdinitreset();
|
val = agesawrapper_amdinitreset();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitreset\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitreset\n");
|
||||||
|
|
||||||
post_code(0x37);
|
post_code(0x37);
|
||||||
val = agesawrapper_amdinitearly();
|
val = agesawrapper_amdinitearly();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n");
|
||||||
|
|
||||||
post_code(0x38);
|
post_code(0x38);
|
||||||
val = agesawrapper_amdinitpost();
|
val = agesawrapper_amdinitpost();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n");
|
||||||
|
|
||||||
@@ -104,7 +107,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
post_code(0x40);
|
post_code(0x40);
|
||||||
val = agesawrapper_amdinitenv();
|
val = agesawrapper_amdinitenv();
|
||||||
if (val) {
|
if (val) {
|
||||||
printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n", val);
|
printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n",
|
||||||
|
val);
|
||||||
}
|
}
|
||||||
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n");
|
printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n");
|
||||||
|
|
||||||
@@ -124,4 +128,3 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|||||||
|
|
||||||
post_code(0x44); // Should never see this post code.
|
post_code(0x44); // Should never see this post code.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user