sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding-style and whitespace fixes (also to make the code more similar

Browse Source 
the Lippert Cool SpaceRunner LX which is already in svn).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3761 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann
2008-11-19 13:42:14 +00:00
parent f31ca16793
commit 86c9b88392
7 changed files with 211 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mainboard/lippert/roadrunner-lx/Config.lb
View File

@ -3,8 +3,6 @@
##
## Copyright (C) 2008 LiPPERT Embedded Computers GmbH
##
## Based on Config.lb from AMD's DB800 and DBM690T mainboards.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
@ -20,6 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
## Based on Config.lb from AMD's DB800 and DBM690T mainboards.
##
## Compute the location and size of where this firmware image
## (coreboot plus bootloader) will live in the boot rom chip.
@ -52,7 +52,7 @@ default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
## XIP_ROM_SIZE must be a power of 2.
## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
##
default XIP_ROM_SIZE=65536
default XIP_ROM_SIZE = 64 * 1024
default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
@ -136,21 +136,24 @@ if USE_DCACHE_RAM
end
##
## Include the secondary Configuration files
## Include the secondary configuration files
##
dir /pc80
config chip.h
register "sio_gp1x_config" = "0x20" # bit1 switches Com1 to RS485, bit2 same for Com2, bit5 turns off Live LED
# Bit1 switches Com1 to RS485, bit2 same for Com2, bit5 turns off Live LED.
register "sio_gp1x_config" = "0x20"
chip northbridge/amd/lx
device pci_domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
chip southbridge/amd/cs5536
# IRQ 12 and 1 unmasked, Keyboard and Mouse IRQs. OK
# SIRQ Mode = Active(Quiet) mode. Save power....
# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse, UARTs, etc IRQs. OK
chip southbridge/amd/cs5536 # Southbridge
# IRQ 12 and 1 unmasked, keyboard and mouse IRQs. OK
# SIRQ Mode = Active(Quiet) mode. Save power...
# Invert mask = IRQ 12 and 1 are active high. Keyboard and mouse,
# UARTs, etc IRQs. OK
register "lpc_serirq_enable" = "0x000012DA" # 00010010 11011010
register "lpc_serirq_polarity" = "0x0000ED25" # inverse of above
register "lpc_serirq_mode" = "1"
@ -171,7 +174,7 @@ chip northbridge/amd/lx
device pci b.0 on end # Slot1
device pci c.0 on end # IT8888
device pci e.0 on end # Ethernet
device pci f.0 on # ISA Bridge
device pci f.0 on # ISA bridge
chip superio/ite/it8712f
device pnp 2e.0 off # Floppy
io 0x60 = 0x3f0
@ -186,7 +189,7 @@ chip northbridge/amd/lx
io 0x60 = 0x2f8
irq 0x70 = 3
end
device pnp 2e.3 on # Parallel Port
device pnp 2e.3 on # Parallel port
io 0x60 = 0x378
irq 0x70 = 7
end
@ -195,12 +198,12 @@ chip northbridge/amd/lx
io 0x62 = 0x230
irq 0x70 = 9
end
device pnp 2e.5 on # Keyboard
device pnp 2e.5 on # PS/2 keyboard
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1
end
device pnp 2e.6 on # Mouse
device pnp 2e.6 on # PS/2 mouse
irq 0x70 = 12
end
device pnp 2e.7 on # GPIO
@ -211,13 +214,13 @@ chip northbridge/amd/lx
io 0x60 = 0x300
irq 0x70 = 9
end
device pnp 2e.9 off # GAME
device pnp 2e.9 off # Game port
io 0x60 = 0x220
end
device pnp 2e.a off end # CIR
end
end
device pci f.2 on end # IDE Controller
device pci f.2 on end # IDE controller
device pci f.3 on end # Audio
device pci f.4 on end # OHCI
device pci f.5 on end # EHCI

12
src/mainboard/lippert/roadrunner-lx/Options.lb
View File

@ -3,8 +3,6 @@
##
## Copyright (C) 2008 LiPPERT Embedded Computers GmbH
##
## Based on Options.lb from AMD's DB800 mainboard.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
@ -20,6 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
## Based on Options.lb from AMD's DB800 mainboard.
uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
@ -126,8 +126,8 @@ default HAVE_OPTION_TABLE=0
###
## ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default ROM_IMAGE_SIZE = 65536
default FALLBACK_SIZE = 131072
default ROM_IMAGE_SIZE = 64 * 1024
default FALLBACK_SIZE = 128 * 1024
##
## enable CACHE_AS_RAM specifics
@ -139,12 +139,12 @@ default DCACHE_RAM_SIZE=0x08000
##
## Use a small 8K stack
##
default STACK_SIZE=0x2000
default STACK_SIZE = 8 * 1024
##
## Use a small 16K heap
##
default HEAP_SIZE=0x4000
default HEAP_SIZE = 16 * 1024
##
## Only use the option table in a normal image

18
src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c
View File

@ -4,8 +4,6 @@
* Copyright (C) 2008 LiPPERT Embedded Computers GmbH
* Copyright (C) 2007 Advanced Micro Devices, Inc.
*
* Based on cache_as_ram_auto.c from AMD's DB800 and DBM690T mainboards.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@ -21,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Based on cache_as_ram_auto.c from AMD's DB800 and DBM690T mainboards. */
#define ASSEMBLY 1
#include <stdlib.h>
@ -52,7 +52,9 @@
static inline int spd_read_byte(unsigned int device, unsigned int address)
{
if (device != DIMM0) return 0xFF; // no DIMM1, don't even try
if (device != DIMM0)
return 0xFF; /* No DIMM1, don't even try. */
return smbus_read_byte(device, address);
}
@ -120,11 +122,12 @@ static void mb_gpio_init(void)
{
int i;
/* Init SuperIO WDT, GPIOs. Done early, WDT init may trigger reset! */
/* Init Super I/O WDT, GPIOs. Done early, WDT init may trigger reset! */
it8712f_enter_conf();
for (i = 0; i < ARRAY_SIZE(sio_init_table); i++) {
u16 val = sio_init_table[i];
outb((u8)val, SIO_INDEX); outb(val>>8, SIO_DATA);
outb((u8)val, SIO_INDEX);
outb(val >> 8, SIO_DATA);
}
it8712f_exit_conf();
}
@ -142,10 +145,11 @@ void cache_as_ram_main(void)
cs5536_early_setup();
/* Note: must do this AFTER the early_setup! It is counting on some
/*
* Note: must do this AFTER the early_setup! It is counting on some
* early MSR setup for CS5536.
*/
it8712f_enable_serial(0, TTYS0_BASE); // does not use its 1st parameter
it8712f_enable_serial(0, TTYS0_BASE); // Does not use its 1st parameter
mb_gpio_init();
uart_init();
console_init();

7
src/mainboard/lippert/roadrunner-lx/chip.h
View File

@ -3,8 +3,6 @@
*
* Copyright (C) 2008 LiPPERT Embedded Computers GmbH
*
* Based on chip.h from AMD's DB800 mainboard.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@ -20,10 +18,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Based on chip.h from AMD's DB800 mainboard. */
#include <stdint.h>
extern struct chip_operations mainboard_lippert_roadrunner_lx_ops;
struct mainboard_lippert_roadrunner_lx_config {
u8 sio_gp1x_config; // bit5=Live LED, bit2=RS485_EN2, bit1=RS485_EN1
/* bit5 = Live LED, bit2 = RS485_EN2, bit1 = RS485_EN1 */
u8 sio_gp1x_config;
};

6
src/mainboard/lippert/roadrunner-lx/irq_tables.c
View File

@ -3,8 +3,6 @@
*
* Copyright (C) 2008 LiPPERT Embedded Computers GmbH
*
* Based on irq_tables.c from AMD's DB800 mainboard.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@ -20,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Based on irq_tables.c from AMD's DB800 mainboard. */
#include <arch/pirq_routing.h>
#include <console/console.h>
#include <arch/io.h>
@ -59,7 +59,7 @@ const struct irq_routing_table intel_irq_routing_table = {
{
/* If you change the number of entries, change the IRQ_SLOT_COUNT above! */
/* bus, dev|fn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu */
{0x00, (0x01 << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, /* cpu */
{0x00, (0x01 << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, /* CPU */
{0x00, (0x0F << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x0, 0x0}, /* chipset */
{0x00, (0x0E << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, /* ethernet */
{0x00, (0x0B << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x1, 0x0}, /* slot1 */

32
src/mainboard/lippert/roadrunner-lx/mainboard.c
View File

@ -3,8 +3,6 @@
*
* Copyright (C) 2008 LiPPERT Embedded Computers GmbH
*
* Based on mainboard.c from AMD's DB800 mainboard.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@ -20,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Based on mainboard.c from AMD's DB800 mainboard. */
#include <stdlib.h>
#include <stdint.h>
#include <console/console.h>
@ -29,13 +29,13 @@
#include <device/pci_ids.h>
#include "chip.h"
static const u16 ec_init_table[] = { // hi=data, lo=index
0x1900, // enable monitoring
0x0351, // TMPIN1,2 diode mode, TMPIN3 off
0x805C, // unlock zero adjust
0x7056, 0x3C57, // zero adjust TMPIN1,2
0x005C, // lock zero adjust
0xD014 // also set FAN_CTL polarity to Active High
static const u16 ec_init_table[] = { /* hi=data, lo=index */
0x1900, /* Enable monitoring */
0x0351, /* TMPIN1,2 diode mode, TMPIN3 off */
0x805C, /* Unlock zero adjust */
0x7056, 0x3C57, /* Zero adjust TMPIN1,2 */
0x005C, /* Lock zero adjust */
0xD014 /* Also set FAN_CTL polarity to Active High */
};
static void init(struct device *dev)
@ -44,22 +44,24 @@ static void init(struct device *dev)
unsigned int gpio_base, i;
printk_debug("LiPPERT RoadRunner-LX ENTER %s\n", __FUNCTION__);
/* Init CS5536 GPIOs */
gpio_base = pci_read_config32(dev_find_device(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, 0),
PCI_BASE_ADDRESS_1) - 1;
/* Init CS5536 GPIOs. */
gpio_base = pci_read_config32(dev_find_device(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_AMD_CS5536_ISA, 0), PCI_BASE_ADDRESS_1) - 1;
outl(0x00000040, gpio_base + 0x00); // GPIO6 value 1 - LAN_PD#
outl(0x00000040, gpio_base + 0x04); // GPIO6 output 1 - LAN_PD#
outl(0x00000400, gpio_base + 0x34); // GPIO10 in aux1 1 - THRM_ALRM#
outl(0x00000400, gpio_base + 0x20); // GPIO10 input 1 - THRM_ALRM#
outl(0x08000000, gpio_base + 0x98); // GPIO27 pull up 0 - PM-LED
/* Init Environment Controller */
/* Init Environment Controller. */
for (i = 0; i < ARRAY_SIZE(ec_init_table); i++) {
u16 val = ec_init_table[i];
outb((u8)val, 0x0295); outb(val>>8, 0x0296);
outb((u8)val, 0x0295);
outb(val >> 8, 0x0296);
}
outb(mb->sio_gp1x_config, 0x1220); // Simple-I/O GP17-10
outb(mb->sio_gp1x_config, 0x1220); /* Simple-I/O GP17-10 */
printk_debug("LiPPERT RoadRunner-LX EXIT %s\n", __FUNCTION__);
}

4
targets/lippert/roadrunner-lx/Config.lb
View File

@ -40,8 +40,8 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA=0
# Leave 36k for VSA. Usually board is equipped with a 512 KB FWH (LPC) flash,
# however it can be replaced with a 1 MB chip.
option ROM_SIZE=512*1024-36*1024
#option ROM_SIZE=1024*1024-36*1024
option ROM_SIZE = (512 * 1024) - (36 * 1024)
#option ROM_SIZE = (1024 * 1024) - (36 * 1024)
option FALLBACK_SIZE = ROM_SIZE
#option DEFAULT_CONSOLE_LOGLEVEL = 4