aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/amd/torpedo/romstage.c
diff options
context:
space:
mode:
authorMarc Jones <marcj303@gmail.com>2012-01-17 15:41:03 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-01-18 20:08:49 +0100
commitc9ea327a4526fccecf9063b5cf272798fa44377b (patch)
tree649b1d77fb92c19ce009584fbbc8a13d9c9a8386 /src/mainboard/amd/torpedo/romstage.c
parentdb89ec975c39e6523336563923ccf8b7397cc313 (diff)
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>
Diffstat (limited to 'src/mainboard/amd/torpedo/romstage.c')
-rw-r--r--src/mainboard/amd/torpedo/romstage.c167
1 files changed, 85 insertions, 82 deletions
diff --git a/src/mainboard/amd/torpedo/romstage.c b/src/mainboard/amd/torpedo/romstage.c
index 317f697fea..ea902d87c0 100644
--- a/src/mainboard/amd/torpedo/romstage.c
+++ b/src/mainboard/amd/torpedo/romstage.c
@@ -40,88 +40,91 @@
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;
-
- post_code(0x35);
- val = agesawrapper_amdinitmmio();
- if(val) {
- printk(BIOS_DEBUG, "agesawrapper_amdinitmmio failed: %x \n", val);
- }
- printk(BIOS_DEBUG, "Got past agesawrapper_amdinitmmio\n");
-
- if (!cpu_init_detectedx && boot_cpu()) {
- post_code(0x30);
- gpioEarlyInit();
- sb_poweron_init();
-
- post_code(0x31);
-
- kbc1100_early_init(CONFIG_SIO_PORT);
-
- post_code(0x32);
- uart_init();
- post_code(0x33);
- console_init();
- }
-
- /* Halt if there was a built in self test failure */
- post_code(0x34);
- report_bist_failure(bist);
-
- // Load MPB
- val = cpuid_eax(1);
- printk(BIOS_DEBUG, "BSP Family_Model: %08x \n", val);
- printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
-
- post_code(0x36);
- val = agesawrapper_amdinitreset();
- if(val) {
- printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n", val);
- }
- printk(BIOS_DEBUG, "Got past agesawrapper_amdinitreset\n");
-
- post_code(0x37);
- val = agesawrapper_amdinitearly ();
- if(val) {
- printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n", val);
- }
- printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n");
-
- post_code(0x38);
- val = agesawrapper_amdinitpost ();
- if(val) {
- printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n", val);
- }
- printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n");
-
- post_code(0x39);
- sb_before_pci_init ();
- printk(BIOS_DEBUG, "Got past sb_before_pci_init\n");
-
- post_code(0x40);
- val = agesawrapper_amdinitenv ();
- if(val) {
- printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n", val);
- }
- printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n");
-
- /* Initialize i8259 pic */
- post_code(0x41);
- setup_i8259 ();
- printk(BIOS_DEBUG, "Got past setup_i8259\n");
-
- /* Initialize i8254 timers */
- post_code(0x42);
- setup_i8254 ();
- printk(BIOS_DEBUG, "Got past setup_i8254\n");
-
- post_code(0x43);
- copy_and_run(0);
- printk(BIOS_DEBUG, "Got past copy_and_run\n");
-
- post_code(0x44); // Should never see this post code.
+ u32 val;
+
+ post_code(0x35);
+ val = agesawrapper_amdinitmmio();
+ if (val) {
+ printk(BIOS_DEBUG, "agesawrapper_amdinitmmio failed: %x \n",
+ val);
+ }
+ printk(BIOS_DEBUG, "Got past agesawrapper_amdinitmmio\n");
+
+ if (!cpu_init_detectedx && boot_cpu()) {
+ post_code(0x30);
+ gpioEarlyInit();
+ sb_poweron_init();
+
+ post_code(0x31);
+
+ kbc1100_early_init(CONFIG_SIO_PORT);
+
+ post_code(0x32);
+ uart_init();
+ post_code(0x33);
+ console_init();
+ }
+
+ /* Halt if there was a built in self test failure */
+ post_code(0x34);
+ report_bist_failure(bist);
+
+ // Load MPB
+ val = cpuid_eax(1);
+ printk(BIOS_DEBUG, "BSP Family_Model: %08x \n", val);
+ printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
+
+ post_code(0x36);
+ val = agesawrapper_amdinitreset();
+ if (val) {
+ printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n",
+ val);
+ }
+ printk(BIOS_DEBUG, "Got past agesawrapper_amdinitreset\n");
+
+ post_code(0x37);
+ val = agesawrapper_amdinitearly();
+ if (val) {
+ printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n",
+ val);
+ }
+ printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n");
+
+ post_code(0x38);
+ val = agesawrapper_amdinitpost();
+ if (val) {
+ printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n",
+ val);
+ }
+ printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n");
+
+ post_code(0x39);
+ sb_before_pci_init();
+ printk(BIOS_DEBUG, "Got past sb_before_pci_init\n");
+
+ post_code(0x40);
+ val = agesawrapper_amdinitenv();
+ if (val) {
+ printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n",
+ val);
+ }
+ printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n");
+
+ /* Initialize i8259 pic */
+ post_code(0x41);
+ setup_i8259();
+ printk(BIOS_DEBUG, "Got past setup_i8259\n");
+
+ /* Initialize i8254 timers */
+ post_code(0x42);
+ setup_i8254();
+ printk(BIOS_DEBUG, "Got past setup_i8254\n");
+
+ post_code(0x43);
+ copy_and_run(0);
+ printk(BIOS_DEBUG, "Got past copy_and_run\n");
+
+ post_code(0x44); // Should never see this post code.
}
-