June 2011 - coreboot - mail.coreboot.org

New patch to review: 14dfac7 Add local copy of commit-msg hook
by Patrick Georgi June 30, 2011

June 30, 2011

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/73 -gerrit commit 14dfac7be2d1b7dad3ce0d33f8c153316e511acf Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Thu Jun 30 19:55:31 2011 +0200 Add local copy of commit-msg hook To avoid using untrusted network to download code, copy the relevant file to the repo and adapt "make gitconfig" to copy from there. Change-Id: I21f0b58d59250aa5d795cf289267ad93bd8d74db Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile.inc | 2 +- util/gitconfig/commit-msg | 104 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 8191a04..2b3ea8d 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -232,7 +232,7 @@ lint: rm -f $$LINTLOG gitconfig: - if ! [ -x .git/hooks/commit-msg ]; then wget -O .git/hooks/commit-msg http://review.coreboot.org/tools/hooks/commit-msg; chmod +x .git/hooks/commit-msg; fi + if ! [ -x .git/hooks/commit-msg ]; then cp util/gitconfig/commit-msg .git/hooks/commit-msg; chmod +x .git/hooks/commit-msg; fi (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email(a)example.com\n'; exit 1) crossgcc: clean-for-update diff --git a/util/gitconfig/commit-msg b/util/gitconfig/commit-msg new file mode 100755 index 0000000..789bad3 --- /dev/null +++ b/util/gitconfig/commit-msg @@ -0,0 +1,104 @@ +#!/bin/sh +# From Gerrit Code Review 2.1.7-rc2 +# +# Part of Gerrit Code Review (http://code.google.com/p/gerrit/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +CHANGE_ID_AFTER="Bug|Issue" +MSG="$1" + +# Check for, and add if missing, a unique Change-Id +# +add_ChangeId() { + clean_message=`sed -e ' + /^diff --git a\/.*/{ + s/// + q + } + /^Signed-off-by:/d + /^#/d + ' "$MSG" | git stripspace` + if test -z "$clean_message" + then + return + fi + + if grep -i '^Change-Id:' "$MSG" >/dev/null + then + return + fi + + id=`_gen_ChangeId` + perl -e ' + $MSG = shift; + $id = shift; + $CHANGE_ID_AFTER = shift; + + undef $/; + open(I, $MSG); $_ = <I>; close I; + s|^diff --git a/.*||ms; + s|^#.*$||mg; + exit unless $_; + + @message = split /\n/; + $haveFooter = 0; + $startFooter = @message; + for($line = @message - 1; $line >= 0; $line--) { + $_ = $message[$line]; + + if (/^[a-zA-Z0-9-]+:/ && !m,^[a-z0-9-]+://,) { + $haveFooter++; + next; + } + next if /^[ []/; + $startFooter = $line if ($haveFooter && /^\r?$/); + last; + } + + @footer = @message[$startFooter+1..@message]; + @message = @message[0..$startFooter]; + push(@footer, "") unless @footer; + + for ($line = 0; $line < @footer; $line++) { + $_ = $footer[$line]; + next if /^($CHANGE_ID_AFTER):/i; + last; + } + splice(@footer, $line, 0, "Change-Id: I$id"); + + $_ = join("\n", @message, @footer); + open(O, ">$MSG"); print O; close O; + ' "$MSG" "$id" "$CHANGE_ID_AFTER" +} +_gen_ChangeIdInput() { + echo "tree `git write-tree`" + if parent=`git rev-parse HEAD^0 2>/dev/null` + then + echo "parent $parent" + fi + echo "author `git var GIT_AUTHOR_IDENT`" + echo "committer `git var GIT_COMMITTER_IDENT`" + echo + printf '%s' "$clean_message" +} +_gen_ChangeId() { + _gen_ChangeIdInput | + git hash-object -t commit --stdin +} + + +add_ChangeId

1 0

New patch to review: a7559fa Reduce warnings/errors in libpayload when using picky compiler options
by Patrick Georgi June 30, 2011

June 30, 2011

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/72 -gerrit commit a7559fa5e8a7f587697191f61016527230d49857 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Thu Apr 21 18:57:16 2011 +0200 Reduce warnings/errors in libpayload when using picky compiler options The new build system uses quite a few more -W flags for the compiler by default than the old one. And that's for the better. Change-Id: Ia8e3d28fb35c56760c2bd0983046c7067e8c5dd6 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- payloads/libpayload/Config.in | 4 ++++ payloads/libpayload/arch/i386/coreboot.c | 2 +- payloads/libpayload/arch/i386/main.c | 1 + payloads/libpayload/arch/i386/multiboot.c | 4 ++-- payloads/libpayload/arch/i386/virtual.c | 1 + payloads/libpayload/arch/powerpc/coreboot.c | 2 +- payloads/libpayload/arch/powerpc/main.c | 1 + payloads/libpayload/arch/powerpc/virtual.c | 1 + payloads/libpayload/curses/keyboard.c | 20 ++++++++++---------- payloads/libpayload/curses/tinycurses.c | 2 +- payloads/libpayload/drivers/keyboard.c | 16 ++++++++-------- payloads/libpayload/drivers/serial.c | 2 +- payloads/libpayload/drivers/usb/uhci.c | 2 +- payloads/libpayload/drivers/usb/usbhid.c | 12 ++++++------ payloads/libpayload/include/libpayload.h | 1 + payloads/libpayload/libc/getopt_long.c | 4 +--- payloads/libpayload/libc/printf.c | 2 +- payloads/libpayload/libc/strings.c | 2 ++ payloads/libpayload/libc/sysinfo.c | 2 -- payloads/libpayload/libpci/libpci.c | 10 ++++++---- 20 files changed, 50 insertions(+), 41 deletions(-) diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index 0a9265d..fe53400 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -73,6 +73,10 @@ config TARGET_POWERPC endchoice +config MEMMAP_RAM_ONLY + bool "Only consider RAM entries in memory map for further processing" + default n + config MULTIBOOT bool "Multiboot header support" depends on TARGET_I386 diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c index 8441903..e3c944d 100644 --- a/payloads/libpayload/arch/i386/coreboot.c +++ b/payloads/libpayload/arch/i386/coreboot.c @@ -57,7 +57,7 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info) struct cb_memory_range *range = (struct cb_memory_range *)MEM_RANGE_PTR(mem, i); -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY if (range->type != CB_MEM_RAM) continue; #endif diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/i386/main.c index 48d6ef5..378c6f3 100644 --- a/payloads/libpayload/arch/i386/main.c +++ b/payloads/libpayload/arch/i386/main.c @@ -41,6 +41,7 @@ char *main_argv[MAX_ARGC_COUNT]; * This is our C entry function - set up the system * and jump into the payload entry point. */ +void start_main(void); void start_main(void) { extern int main(int argc, char **argv); diff --git a/payloads/libpayload/arch/i386/multiboot.c b/payloads/libpayload/arch/i386/multiboot.c index 82736b1..fa0c576 100644 --- a/payloads/libpayload/arch/i386/multiboot.c +++ b/payloads/libpayload/arch/i386/multiboot.c @@ -45,7 +45,7 @@ static void mb_parse_mmap(struct multiboot_header *table, while(ptr < (start + table->mmap_length)) { struct multiboot_mmap *mmap = (struct multiboot_mmap *) ptr; -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY /* 1 == normal RAM. Ignore everything else for now */ if (mmap->type == 1) { @@ -56,7 +56,7 @@ static void mb_parse_mmap(struct multiboot_header *table, if (++info->n_memranges == SYSINFO_MAX_MEM_RANGES) return; -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY } #endif diff --git a/payloads/libpayload/arch/i386/virtual.c b/payloads/libpayload/arch/i386/virtual.c index 256bfc2..59768db 100644 --- a/payloads/libpayload/arch/i386/virtual.c +++ b/payloads/libpayload/arch/i386/virtual.c @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <unistd.h> unsigned long virtual_offset = 0; diff --git a/payloads/libpayload/arch/powerpc/coreboot.c b/payloads/libpayload/arch/powerpc/coreboot.c index 95d8f16..ee1842c 100644 --- a/payloads/libpayload/arch/powerpc/coreboot.c +++ b/payloads/libpayload/arch/powerpc/coreboot.c @@ -57,7 +57,7 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info) struct cb_memory_range *range = (struct cb_memory_range *)MEM_RANGE_PTR(mem, i); -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY if (range->type != CB_MEM_RAM) continue; #endif diff --git a/payloads/libpayload/arch/powerpc/main.c b/payloads/libpayload/arch/powerpc/main.c index 48d6ef5..378c6f3 100644 --- a/payloads/libpayload/arch/powerpc/main.c +++ b/payloads/libpayload/arch/powerpc/main.c @@ -41,6 +41,7 @@ char *main_argv[MAX_ARGC_COUNT]; * This is our C entry function - set up the system * and jump into the payload entry point. */ +void start_main(void); void start_main(void) { extern int main(int argc, char **argv); diff --git a/payloads/libpayload/arch/powerpc/virtual.c b/payloads/libpayload/arch/powerpc/virtual.c index 6312ae1..6ff588c 100644 --- a/payloads/libpayload/arch/powerpc/virtual.c +++ b/payloads/libpayload/arch/powerpc/virtual.c @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <unistd.h> unsigned long virtual_offset = 0; diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index a750675..7ebb04f 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -71,7 +71,7 @@ static int getkeyseq(char *buffer, int len, int max) } static struct { - char *seq; + const char *seq; int key; } escape_codes[] = { { "[A", KEY_UP }, @@ -109,7 +109,7 @@ static int handle_escape(void) return 27; for(i = 0; escape_codes[i].seq != NULL; i++) { - char *p = escape_codes[i].seq; + const char *p = escape_codes[i].seq; for(t = 0; t < len; t++) { if (!*p || *p != buffer[t]) @@ -144,7 +144,7 @@ static int cook_serial(unsigned char ch) /* ================ Keyboard ================ */ -static int curses_getchar(int delay) +static int curses_getchar(int _delay) { #if defined(CONFIG_USB_HID) || defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_SERIAL_CONSOLE) unsigned short c; @@ -175,12 +175,12 @@ static int curses_getchar(int delay) } #endif - if (delay == 0) + if (_delay == 0) break; - if (delay > 0) { + if (_delay > 0) { mdelay(1); - delay--; + _delay--; } @@ -193,14 +193,14 @@ static int curses_getchar(int delay) int wgetch(WINDOW *win) { - int delay = -1; + int _delay = -1; if (_halfdelay) - delay = _halfdelay; + _delay = _halfdelay; else - delay = win->_delay; + _delay = win->_delay; - return curses_getchar(delay); + return curses_getchar(_delay); } int nodelay(WINDOW *win, NCURSES_BOOL flag) diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index cb1d695..4d3e8e1 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -971,7 +971,7 @@ int wsetscrreg(WINDOW *win, int top, int bottom) } // void wsyncdown (WINDOW *) {} // void wsyncup (WINDOW *) {} -/* D */ void wtimeout(WINDOW *win, int delay) { win->_delay = delay; } +/* D */ void wtimeout(WINDOW *win, int _delay) { win->_delay = _delay; } /* D */ int wtouchln(WINDOW *win, int y, int n, int changed) { int i; diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index 2b2ac26..0663f47 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -37,8 +37,8 @@ #define I8042_MODE_XLATE 0x40 struct layout_maps { - char *country; - unsigned short map[4][0x57]; + const char *country; + const unsigned short map[4][0x57]; }; static struct layout_maps *map; @@ -261,22 +261,22 @@ int keyboard_getchar(void) static int keyboard_wait_read(void) { - int timeout = 10000; + int retries = 10000; - while(timeout-- && !(inb(0x64) & 0x01)) + while(retries-- && !(inb(0x64) & 0x01)) udelay(50); - return (timeout <= 0) ? -1 : 0; + return (retries <= 0) ? -1 : 0; } static int keyboard_wait_write(void) { - int timeout = 10000; + int retries = 10000; - while(timeout-- && (inb(0x64) & 0x02)) + while(retries-- && (inb(0x64) & 0x02)) udelay(50); - return (timeout <= 0) ? -1 : 0; + return (retries <= 0) ? -1 : 0; } static unsigned char keyboard_get_mode(void) diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c index 0674ec8..c6804d2 100644 --- a/payloads/libpayload/drivers/serial.c +++ b/payloads/libpayload/drivers/serial.c @@ -195,7 +195,7 @@ int serial_getchar(void) /* A vt100 doesn't do color, setaf/setab below are from xterm-color. */ #define VT100_SET_COLOR "\e[3%d;4%dm" -static void serial_putcmd(char *str) +static void serial_putcmd(const char *str) { while(*str) serial_putchar(*(str++)); diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c index 721fde0..1f80c6a 100644 --- a/payloads/libpayload/drivers/usb/uhci.c +++ b/payloads/libpayload/drivers/usb/uhci.c @@ -65,7 +65,7 @@ static void td_dump (td_t *td) { char td_value[3]; - char *td_type; + const char *td_type; switch (td->pid) { case UHCI_SETUP: td_type="SETUP"; diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c index 84de0c8..bf3ec1e 100644 --- a/payloads/libpayload/drivers/usb/usbhid.c +++ b/payloads/libpayload/drivers/usb/usbhid.c @@ -62,7 +62,7 @@ static int keycount; #define KEYBOARD_BUFFER_SIZE 16 static short keybuffer[KEYBOARD_BUFFER_SIZE]; -char *countries[36][2] = { +const char *countries[36][2] = { { "not supported", "us" }, { "Arabic", "ae" }, { "Belgian", "be" }, @@ -105,13 +105,13 @@ char *countries[36][2] = { struct layout_maps { - char *country; - short map[4][0x80]; + const char *country; + const short map[4][0x80]; }; -static struct layout_maps *map; +static const struct layout_maps *map; -static struct layout_maps keyboard_layouts[] = { +static const struct layout_maps keyboard_layouts[] = { // #ifdef CONFIG_PC_KEYBOARD_LAYOUT_US { .country = "us", .map = { { /* No modifier */ @@ -378,7 +378,7 @@ static struct console_input_driver cons = { }; -int usb_hid_set_layout (char *country) +static int usb_hid_set_layout (const char *country) { /* FIXME should be per keyboard */ int i; diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 74fb79a..6ce7548 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -272,6 +272,7 @@ typedef struct { void SHA1Init(SHA1_CTX *context); void SHA1Transform(u32 state[5], const u8 buffer[SHA1_BLOCK_LENGTH]); void SHA1Update(SHA1_CTX *context, const u8 *data, size_t len); +void SHA1Pad(SHA1_CTX *context); void SHA1Final(u8 digest[SHA1_DIGEST_LENGTH], SHA1_CTX *context); u8 *sha1(const u8 *data, size_t len, u8 *buf); /** @} */ diff --git a/payloads/libpayload/libc/getopt_long.c b/payloads/libpayload/libc/getopt_long.c index 493df4d..365bc4a 100644 --- a/payloads/libpayload/libc/getopt_long.c +++ b/payloads/libpayload/libc/getopt_long.c @@ -57,10 +57,8 @@ #include <libpayload.h> #include <getopt.h> #define warnx(x...) printf(x) -/* #include <stdlib.h> #include <string.h> -*/ #define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ #ifdef REPLACE_GETOPT @@ -84,7 +82,7 @@ int posixly_correct = 0; #define BADARG ((*options == ':') ? (int)':' : (int)'?') #define INORDER (int)1 -#define EMSG "" +#define EMSG (char*)"" static int getopt_internal(int, char * const *, const char *, const struct option *, int *, int); diff --git a/payloads/libpayload/libc/printf.c b/payloads/libpayload/libc/printf.c index 389d227..e3cf8bb 100644 --- a/payloads/libpayload/libc/printf.c +++ b/payloads/libpayload/libc/printf.c @@ -114,7 +114,7 @@ static int printf_putstr(const char *str, struct printf_spec *ps) size_t count; if (str == NULL) { - char *nullstr = "(NULL)"; + const char *nullstr = "(NULL)"; return printf_putnchars(nullstr, strlen(nullstr), ps); } diff --git a/payloads/libpayload/libc/strings.c b/payloads/libpayload/libc/strings.c index 9a56ba1..465ae4f 100644 --- a/payloads/libpayload/libc/strings.c +++ b/payloads/libpayload/libc/strings.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include <strings.h> + int ffs(int i) { int count = 1; diff --git a/payloads/libpayload/libc/sysinfo.c b/payloads/libpayload/libc/sysinfo.c index 73a9ab5..b1cad50 100644 --- a/payloads/libpayload/libc/sysinfo.c +++ b/payloads/libpayload/libc/sysinfo.c @@ -30,8 +30,6 @@ #include <libpayload.h> #include <sysinfo.h> -extern struct sysinfo_t lib_sysinfo; - int sysinfo_have_multiboot(unsigned long *addr) { *addr = (unsigned long) lib_sysinfo.mbtable; diff --git a/payloads/libpayload/libpci/libpci.c b/payloads/libpayload/libpci/libpci.c index 0b54ba3..203e770 100644 --- a/payloads/libpayload/libpci/libpci.c +++ b/payloads/libpayload/libpci/libpci.c @@ -96,6 +96,8 @@ void pci_filter_init(struct pci_access* pacc, struct pci_filter* pf) pf->device = -1; } +static char *invalid_pci_device_string = (char *)"invalid pci device string"; + /* parse domain:bus:dev.func (with all components but "dev" optional) * into filter. * Returns NULL on success, a string pointer to the error message otherwise. @@ -109,7 +111,7 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) char *funcp = strrchr(id, '.'); if (funcp) { filter->func = strtoul(funcp+1, &endptr, 0); - if (endptr[0] != '\0') return "invalid pci device string"; + if (endptr[0] != '\0') return invalid_pci_device_string; } char *devp = strrchr(id, ':'); @@ -118,7 +120,7 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) } else { filter->dev = strtoul(devp+1, &endptr, 0); } - if (endptr != funcp) return "invalid pci device string"; + if (endptr != funcp) return invalid_pci_device_string; if (!devp) return NULL; char *busp = strchr(id, ':'); @@ -127,11 +129,11 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) } else { filter->bus = strtoul(busp+1, &endptr, 0); } - if (endptr != funcp) return "invalid pci device string"; + if (endptr != funcp) return invalid_pci_device_string; if (busp == devp) return NULL; filter->domain = strtoul(id, &endptr, 0); - if (endptr != busp) return "invalid pci device string"; + if (endptr != busp) return invalid_pci_device_string; return NULL; }

1 0

New patch to review: 14441f2 Use coreboot build system for libpayload, too.
by Patrick Georgi June 30, 2011

June 30, 2011

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/71 -gerrit commit 14441f2410471ff7d4b1d89ad936acc9da3d5e1d Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Thu Apr 21 18:48:50 2011 +0200 Use coreboot build system for libpayload, too. This change makes building coreboot related projects more unified. Change-Id: I0f1181e2fffde1e03675523f7dc9eef3119052c3 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- payloads/libpayload/Makefile | 315 ++++++++++++++++--------- payloads/libpayload/Makefile.inc | 105 ++++++++ payloads/libpayload/arch/i386/Makefile.inc | 9 +- payloads/libpayload/arch/powerpc/Makefile.inc | 7 +- payloads/libpayload/crypto/Makefile.inc | 2 +- payloads/libpayload/curses/Makefile.inc | 8 +- payloads/libpayload/drivers/Makefile.inc | 56 +++--- payloads/libpayload/libc/Makefile.inc | 14 +- payloads/libpayload/libpci/Makefile.inc | 2 +- 9 files changed, 360 insertions(+), 158 deletions(-) diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 4363590..b976baa 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -1,8 +1,10 @@ ## -## This file is part of the libpayload project. +## This file is part of the coreboot project. ## ## Copyright (C) 2008 Advanced Micro Devices, Inc. ## Copyright (C) 2008 Uwe Hermann <uwe(a)hermann-uwe.de> +## Copyright (C) 2009-2010 coresystems GmbH +## Copyright (C) 2011 secunet Security Networks AG ## ## Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions @@ -28,159 +30,250 @@ ## SUCH DAMAGE. ## -export src := $(shell pwd) -export srctree := $(src) -export srck := $(src)/util/kconfig -export obj := $(src)/build -export objk := $(src)/build/util/kconfig +ifeq ($(INNER_SCANBUILD),y) +CC_real:=$(CC) +endif + +$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) +include .xcompile + +ifeq ($(INNER_SCANBUILD),y) +CC:=$(CC_real) +HOSTCC:=$(CC_real) --hostcc +HOSTCXX:=$(CC_real) --hostcxx +endif + +export top := $(CURDIR) +export src := src +export srck := $(top)/util/kconfig +export obj ?= build +export objutil ?= $(obj)/util +export objk := $(objutil)/kconfig -export KERNELVERSION := 0.2.0 -export KCONFIG_AUTOHEADER := $(obj)/include/libpayload-config.h + +export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf +# directory containing the toplevel Makefile.inc +TOPLEVEL := . + CONFIG_SHELL := sh KBUILD_DEFCONFIG := configs/defconfig UNAME_RELEASE := $(shell uname -r) -HAVE_DOTCONFIG := $(wildcard .config) +DOTCONFIG ?= .config +KCONFIG_CONFIG = $(DOTCONFIG) +export KCONFIG_CONFIG +HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG)) MAKEFLAGS += -rR --no-print-directory # Make is silent per default, but 'make V=1' will show all compiler calls. +Q:=@ ifneq ($(V),1) -Q := @ +ifneq ($(Q),) +.SILENT: +endif endif -$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) -include .xcompile - -CC ?= gcc +CPP:= $(CC) -x assembler-with-cpp -DASSEMBLY -E HOSTCC = gcc HOSTCXX = g++ -HOSTCFLAGS := -I$(srck) -I$(objk) -pipe -HOSTCXXFLAGS := -I$(srck) -I$(objk) -pipe - -DESTDIR = $(src)/install +HOSTCFLAGS := -I$(srck) -I$(objk) -g +HOSTCXXFLAGS := -I$(srck) -I$(objk) +LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name) DOXYGEN := doxygen DOXYGEN_OUTPUT_DIR := doxygen +all: real-all + +# This include must come _before_ the pattern rules below! +# Order _does_ matter for pattern rules. +include util/kconfig/Makefile + +# Three cases where we don't need fully populated $(obj) lists: +# 1. when no .config exists +# 2. when make config (in any flavour) is run +# 3. when make distclean is run +# Don't waste time on reading all Makefile.incs in these cases ifeq ($(strip $(HAVE_DOTCONFIG)),) +NOCOMPILE:=1 +endif +ifneq ($(MAKECMDGOALS),) +ifneq ($(filter %config distclean,$(MAKECMDGOALS)),) +NOCOMPILE:=1 +endif +endif -all: config +ifeq ($(NOCOMPILE),1) +include $(TOPLEVEL)/Makefile.inc +real-all: config else -include $(src)/.config +include $(HAVE_DOTCONFIG) -ARCHDIR-$(CONFIG_TARGET_I386) := i386 -ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc +ifneq ($(INNER_SCANBUILD),y) +ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) +CC:=clang -m32 +HOSTCC:=clang +endif +endif -PLATFORM-y += arch/$(ARCHDIR-y)/Makefile.inc -TARGETS-y := +ifeq ($(CONFIG_CCACHE),y) +CCACHE:=$(word 1,$(wildcard $(addsuffix /ccache,$(subst :, ,$(PATH))))) +ifeq ($(CCACHE),) +$(error ccache selected, but not found in PATH) +endif +CCACHE:=CCACHE_COMPILERCHECK=content CCACHE_BASEDIR=$(top) $(CCACHE) +CC := $(CCACHE) $(CC) +HOSTCC := $(CCACHE) $(HOSTCC) +HOSTCXX := $(CCACHE) $(HOSTCXX) +ROMCC := $(CCACHE) $(ROMCC) +endif -BUILD-y := crypto/Makefile.inc libc/Makefile.inc drivers/Makefile.inc libpci/Makefile.inc -BUILD-$(CONFIG_TINYCURSES) += curses/Makefile.inc +strip_quotes = $(subst ",,$(subst \",,$(1))) # The primary target needs to be here before we include the # other files -all: lib - -include $(PLATFORM-y) $(BUILD-y) - -OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) -INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) -I$(obj)/include -INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include - -try-run= $(shell set -e; \ -TMP=".$$$$.tmp"; \ -if ($(1)) > /dev/null 2>&1; \ -then echo "$(2)"; \ -else echo "$(3)"; \ -fi; rm -rf "$$TMP") - -cc-option= $(call try-run,\ -$(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2)) - -STACKPROTECT += $(call cc-option, -fno-stack-protector,) - -# TODO: Re-add -Os as soon as we find out why it caused problems. -CFLAGS := -Wall -Werror $(STACKPROTECT) -nostdinc $(INCLUDES) -ffreestanding -pipe - -all: lib - -lib: $(obj)/lib/libpayload.a $(obj)/lib/$(ARCHDIR-y)/head.o +ifeq ($(INNER_SCANBUILD),y) +CONFIG_SCANBUILD_ENABLE:= +endif -$(obj)/lib/$(ARCHDIR-y)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.S.o - $(Q)printf " CP $(subst $(shell pwd)/,,$(@))\n" - $(Q)cp $< $@ +ifeq ($(CONFIG_SCANBUILD_ENABLE),y) +ifneq ($(CONFIG_SCANBUILD_REPORT_LOCATION),) +CONFIG_SCANBUILD_REPORT_LOCATION:=-o $(CONFIG_SCANBUILD_REPORT_LOCATION) +endif +real-all: + echo '#!/bin/sh' > .ccwrap + echo 'CC="$(CC)"' >> .ccwrap + echo 'if [ "$$1" = "--hostcc" ]; then shift; CC="$(HOSTCC)"; fi' >> .ccwrap + echo 'if [ "$$1" = "--hostcxx" ]; then shift; CC="$(HOSTCXX)"; fi' >> .ccwrap + echo 'eval $$CC $$*' >> .ccwrap + chmod +x .ccwrap + scan-build $(CONFIG_SCANBUILD_REPORT_LOCATION) -analyze-headers --use-cc=$(top)/.ccwrap --use-c++=$(top)/.ccwrap $(MAKE) INNER_SCANBUILD=y +else +real-all: real-target +endif -$(obj)/lib/libpayload.a: prepare $(OBJS) - $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(AR) rc $@ $(OBJS) +# must come rather early +.SECONDEXPANSION: + +$(obj)/config.h: + $(MAKE) oldconfig + +# Add a new class of source/object files to the build system +add-class= \ + $(eval $(1)-srcs:=) \ + $(eval $(1)-objs:=) \ + $(eval classes+=$(1)) + +# Special classes are managed types with special behaviour +# On parse time, for each entry in variable $(1)-y +# a handler $(1)-handler is executed with the arguments: +# * $(1): directory the parser is in +# * $(2): current entry +add-special-class= \ + $(eval $(1):=) \ + $(eval special-classes+=$(1)) + +# Clean -y variables, include Makefile.inc +# Add paths to files in X-y to X-srcs +# Add subdirs-y to subdirs +includemakefiles= \ + $(foreach class,classes subdirs $(classes) $(special-classes), $(eval $(class)-y:=)) \ + $(eval -include $(1)) \ + $(foreach class,$(classes-y), $(call add-class,$(class))) \ + $(foreach class,$(classes), \ + $(eval $(class)-srcs+= \ + $$(subst $(top)/,, \ + $$(abspath $$(addprefix $(dir $(1)),$$($(class)-y)))))) \ + $(foreach special,$(special-classes), \ + $(foreach item,$($(special)-y), $(call $(special)-handler,$(dir $(1)),$(item)))) \ + $(eval subdirs+=$$(subst $(CURDIR)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y))))) + +# For each path in $(subdirs) call includemakefiles +# Repeat until subdirs is empty +evaluate_subdirs= \ + $(eval cursubdirs:=$(subdirs)) \ + $(eval subdirs:=) \ + $(foreach dir,$(cursubdirs), \ + $(eval $(call includemakefiles,$(dir)/Makefile.inc))) \ + $(if $(subdirs),$(eval $(call evaluate_subdirs))) + +# collect all object files eligible for building +subdirs:=$(TOPLEVEL) +$(eval $(call evaluate_subdirs)) + +src-to-obj=$(addsuffix .$(1).o, $(basename $(addprefix $(obj)/, $($(1)-srcs)))) +$(foreach class,$(classes),$(eval $(class)-objs:=$(call src-to-obj,$(class)))) + +allsrcs:=$(foreach var, $(addsuffix -srcs,$(classes)), $($(var))) +allobjs:=$(foreach var, $(addsuffix -objs,$(classes)), $($(var))) +alldirs:=$(sort $(abspath $(dir $(allobjs)))) + +# macro to define template macros that are used by use_template macro +define create_cc_template +# $1 obj class +# $2 source suffix (c, S) +# $3 additional compiler flags +# $4 additional dependencies +ifn$(EMPTY)def $(1)-objs_$(2)_template +de$(EMPTY)fine $(1)-objs_$(2)_template +$(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/config.h $(4) + @printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" + $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< +en$(EMPTY)def +end$(EMPTY)if +endef + +filetypes-of-class=$(subst .,,$(sort $(suffix $($(1)-srcs)))) +$(foreach class,$(classes), \ + $(foreach type,$(call filetypes-of-class,$(class)), \ + $(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-ccopts),$($(class)-$(type)-deps))))) + +foreach-src=$(foreach file,$($(1)-srcs),$(eval $(call $(1)-objs_$(subst .,,$(suffix $(file)))_template,$(basename $(file))))) +$(eval $(foreach class,$(classes),$(call foreach-src,$(class)))) + +DEPENDENCIES = $(allobjs:.o=.d) +-include $(DEPENDENCIES) + +printall: + @$(foreach class,$(classes),echo $(class)-objs:=$($(class)-objs); ) + @echo alldirs:=$(alldirs) + @echo allsrcs=$(allsrcs) + @echo DEPENDENCIES=$(DEPENDENCIES) + @echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME) + @$(foreach class,$(special-classes),echo $(class):='$($(class))'; ) endif -install: lib - $(Q)printf " INSTALL $(DESTDIR)/libpayload/lib\n" - $(Q)install -m 755 -d $(DESTDIR)/libpayload/lib - $(Q)install -m 644 $(obj)/lib/libpayload.a $(DESTDIR)/libpayload/lib/ - $(Q)install -m 644 lib/libpayload.ldscript $(DESTDIR)/libpayload/lib/ - $(Q)install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) - $(Q)install -m 644 $(obj)/lib/$(ARCHDIR-y)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) - $(Q)printf " INSTALL $(DESTDIR)/libpayload/include\n" - $(Q)install -m 755 -d $(DESTDIR)/libpayload/include - $(Q)for file in `find include -name *.h -type f`; do \ - install -m 755 -d $(DESTDIR)/libpayload/`dirname $$file`; \ - install -m 644 $$file $(DESTDIR)/libpayload/$$file; \ - done - $(Q)install -m 644 $(KCONFIG_AUTOHEADER) $(DESTDIR)/libpayload/include - $(Q)printf " INSTALL $(DESTDIR)/libpayload/bin\n" - $(Q)install -m 755 -d $(DESTDIR)/libpayload/bin - $(Q)install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin - $(Q)install -m 755 bin/lpas $(DESTDIR)/libpayload/bin - $(Q)install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin - $(Q)install -m 644 .config $(DESTDIR)/libpayload/libpayload.config - -prepare: - $(Q)mkdir -p $(obj)/util/kconfig/lxdialog - $(Q)mkdir -p $(obj)/crypto $(obj)/curses $(obj)/drivers/video - $(Q)mkdir -p $(obj)/drivers/usb - $(Q)mkdir -p $(obj)/arch/$(ARCHDIR-y) $(obj)/lib/$(ARCHDIR-y) $(obj)/libc $(obj)/libpci - $(Q)mkdir -p $(obj)/lib/$(ARCHDIR-y) - $(Q)mkdir -p $(obj)/include +$(shell mkdir -p $(obj) $(objutil)/kconfig/lxdialog $(additional-dirs) $(alldirs)) + +cscope: + cscope -bR doxy: doxygen doxygen: - $(Q)$(DOXYGEN) Doxyfile + $(DOXYGEN) Doxyfile doxyclean: doxygen-clean doxygen-clean: - $(Q)rm -rf $(DOXYGEN_OUTPUT_DIR) - -clean: doxygen-clean - $(Q)rm -rf $(obj)/crypto $(obj)/curses $(obj)/drivers - $(Q)rm -rf $(obj)/i386 $(obj)/powerpc $(obj)/lib $(obj)/libc - -distclean: clean - $(Q)rm -rf build # should be $(obj) ? - $(Q)rm -f .config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig* - -# This include must come _before_ the pattern rules below! -# Order _does_ matter for pattern rules. -include util/kconfig/Makefile - -ifeq ($(strip $(HAVE_DOTCONFIG)),) -else + rm -rf $(DOXYGEN_OUTPUT_DIR) -$(obj)/%.o: $(src)/%.c - $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< +clean-for-update: doxygen-clean clean-for-update-target + rm -f $(allobjs) .xcompile + rm -f $(DEPENDENCIES) + rmdir -p $(alldirs) 2>/dev/null >/dev/null || true -$(obj)/%.S.o: $(src)/%.S - $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< +clean: clean-for-update clean-target + rm -f .ccwrap -endif +clean-cscope: + rm -f cscope.out -.PHONY: $(PHONY) prepare install clean distclean doxygen doxy +distclean: clean-cscope + rm -rf $(obj) + rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile +.PHONY: $(PHONY) clean clean-cscope cscope distclean doxygen doxy .xcompile diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc new file mode 100644 index 0000000..08f7c9f --- /dev/null +++ b/payloads/libpayload/Makefile.inc @@ -0,0 +1,105 @@ +## +## This file is part of the libpayload project. +## +## Copyright (C) 2008 Advanced Micro Devices, Inc. +## Copyright (C) 2008 Uwe Hermann <uwe(a)hermann-uwe.de> +## Copyright (C) 2011 secunet Security Networks AG +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions +## are met: +## 1. Redistributions of source code must retain the above copyright +## notice, this list of conditions and the following disclaimer. +## 2. Redistributions in binary form must reproduce the above copyright +## notice, this list of conditions and the following disclaimer in the +## documentation and/or other materials provided with the distribution. +## 3. The name of the author may not be used to endorse or promote products +## derived from this software without specific prior written permission. +## +## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +export KERNELVERSION := 0.2.0 + +ARCHDIR-$(CONFIG_TARGET_I386) := i386 +ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc + +real-target: lib + +classes-$(CONFIG_PCI) += libpci +classes-$(CONFIG_LIBC) += libc +classes-$(CONFIG_TINYCURSES) += libcurses +libraries := $(classes-y) +classes-y += head.o + +libpci-c-deps = $(obj)/libpayload-config.h +libc-c-deps = $(obj)/libpayload-config.h +libcurses-c-deps = $(obj)/libpayload-config.h +head.o-S-deps = $(obj)/libpayload-config.h + +subdirs-y := arch/$(ARCHDIR-y) +subdirs-y += crypto libc drivers libpci +subdirs-$(CONFIG_TINYCURSES) += curses + +INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) +CFLAGS = $(INCLUDES) -O2 -pipe -g +CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes +CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs +CFLAGS += -Wstrict-aliasing -Wshadow -fno-builtin + +$(obj)/libpayload-config.h: $(KCONFIG_AUTOHEADER) + cmp $@ $< 2>/dev/null || cp $< $@ + +library-targets = $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a +lib: $$(library-targets) $(obj)/head.o + +$(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs)) + printf " AR $(subst $(shell pwd)/,,$(@))\n" + $(AR) rc $@ $^ + +$(obj)/%.a: $$(%-objs) + printf " AR $(subst $(shell pwd)/,,$(@))\n" + $(AR) rc $@ $^ + +$(obj)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.head.o.o + printf " CP $(subst $(shell pwd)/,,$(@))\n" + cp $^ $@ + +install: real-target + printf " INSTALL $(DESTDIR)/libpayload/lib\n" + install -m 755 -d $(DESTDIR)/libpayload/lib + for lib in $(library-targets); do \ + install -m 644 $$lib $(DESTDIR)/libpayload/lib/; \ + done + install -m 644 lib/libpayload.ldscript $(DESTDIR)/libpayload/lib/ + install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) + install -m 644 $(obj)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) + printf " INSTALL $(DESTDIR)/libpayload/include\n" + install -m 755 -d $(DESTDIR)/libpayload/include + for file in `find include -name *.h -type f`; do \ + install -m 755 -d $(DESTDIR)/libpayload/`dirname $$file`; \ + install -m 644 $$file $(DESTDIR)/libpayload/$$file; \ + done + install -m 644 $(obj)/libpayload-config.h $(DESTDIR)/libpayload/include + printf " INSTALL $(DESTDIR)/libpayload/bin\n" + install -m 755 -d $(DESTDIR)/libpayload/bin + install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin + install -m 755 bin/lpas $(DESTDIR)/libpayload/bin + install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin + install -m 644 .config $(DESTDIR)/libpayload/libpayload.config + +clean-for-update-target: + rm -f $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a + +clean-target: +prepare: diff --git a/payloads/libpayload/arch/i386/Makefile.inc b/payloads/libpayload/arch/i386/Makefile.inc index 6461b72..2be5e54 100644 --- a/payloads/libpayload/arch/i386/Makefile.inc +++ b/payloads/libpayload/arch/i386/Makefile.inc @@ -27,9 +27,10 @@ ## SUCH DAMAGE. ## -TARGETS-y += arch/i386/head.S.o arch/i386/main.o arch/i386/sysinfo.o -TARGETS-y += arch/i386/timer.o arch/i386/coreboot.o arch/i386/util.S.o -TARGETS-y += arch/i386/exec.S.o arch/i386/virtual.o +head.o-y += head.S +libc-y += main.c sysinfo.c +libc-y += timer.c coreboot.c util.S +libc-y += exec.S virtual.c # Multiboot support is configurable -TARGETS-$(CONFIG_MULTIBOOT) += arch/i386/multiboot.o +libc-$(CONFIG_MULTIBOOT) += multiboot.c diff --git a/payloads/libpayload/arch/powerpc/Makefile.inc b/payloads/libpayload/arch/powerpc/Makefile.inc index ddfb9fb..bfbec27 100644 --- a/payloads/libpayload/arch/powerpc/Makefile.inc +++ b/payloads/libpayload/arch/powerpc/Makefile.inc @@ -27,7 +27,8 @@ ## SUCH DAMAGE. ## -TARGETS-y += arch/powerpc/head.S.o arch/powerpc/main.o arch/powerpc/sysinfo.o -TARGETS-y += arch/powerpc/timer.o arch/powerpc/coreboot.o arch/powerpc/util.S.o -TARGETS-y += arch/powerpc/exec.S.o arch/powerpc/virtual.o +head.o-y := head.S +libc-y += main.c sysinfo.c +libc-y += timer.c coreboot.c util.S.c +libc-y += exec.S virtual.c diff --git a/payloads/libpayload/crypto/Makefile.inc b/payloads/libpayload/crypto/Makefile.inc index 8d9f082..3996728 100644 --- a/payloads/libpayload/crypto/Makefile.inc +++ b/payloads/libpayload/crypto/Makefile.inc @@ -27,4 +27,4 @@ ## SUCH DAMAGE. ## -TARGETS-y += crypto/sha1.o +libc-y += sha1.c diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.inc index 7d5597c..44e3ab7 100644 --- a/payloads/libpayload/curses/Makefile.inc +++ b/payloads/libpayload/curses/Makefile.inc @@ -27,6 +27,8 @@ ## SUCH DAMAGE. ## -TARGETS-$(CONFIG_TINYCURSES) += curses/keyboard.o -TARGETS-$(CONFIG_TINYCURSES) += curses/tinycurses.o -TARGETS-$(CONFIG_TINYCURSES) += curses/colors.o +subdirs-y := libform libpanel libmenu + +libcurses-$(CONFIG_TINYCURSES) += keyboard.c +libcurses-$(CONFIG_TINYCURSES) += tinycurses.c +libcurses-$(CONFIG_TINYCURSES) += colors.c diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index e9496a6..360a258 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -29,45 +29,45 @@ ## SUCH DAMAGE. ## -TARGETS-$(CONFIG_PCI) += drivers/pci.o +libc-$(CONFIG_PCI) += pci.c -TARGETS-$(CONFIG_SPEAKER) += drivers/speaker.o +libc-$(CONFIG_SPEAKER) += speaker.c -TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o +libc-$(CONFIG_SERIAL_CONSOLE) += serial.c -TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o +libc-$(CONFIG_PC_KEYBOARD) += keyboard.c -TARGETS-$(CONFIG_NVRAM) += drivers/nvram.o -TARGETS-$(CONFIG_NVRAM) += drivers/options.o +libc-$(CONFIG_NVRAM) += nvram.c +libc-$(CONFIG_NVRAM) += options.c # Video console drivers -TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o -TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o +libc-$(CONFIG_VIDEO_CONSOLE) += video/video.c +libc-$(CONFIG_VGA_VIDEO_CONSOLE) += video/vga.c # Geode LX console drivers -TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o -TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o +libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/geodelx.c +libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/font8x16.c # coreboot generic framebuffer driver -TARGETS-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += drivers/video/corebootfb.o -TARGETS-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += drivers/video/font8x16.o +libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/corebootfb.c +libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/font8x16.c # USB stack -TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o -TARGETS-$(CONFIG_USB) += drivers/usb/usb.o -TARGETS-$(CONFIG_USB) += drivers/usb/usb_dev.o -TARGETS-$(CONFIG_USB) += drivers/usb/quirks.o -TARGETS-$(CONFIG_USB_HUB) += drivers/usb/usbhub.o -TARGETS-$(CONFIG_USB_UHCI) += drivers/usb/uhci.o -TARGETS-$(CONFIG_USB_UHCI) += drivers/usb/uhci_rh.o -TARGETS-$(CONFIG_USB_OHCI) += drivers/usb/ohci.o -TARGETS-$(CONFIG_USB_OHCI) += drivers/usb/ohci_rh.o -TARGETS-$(CONFIG_USB_EHCI) += drivers/usb/ehci.o -TARGETS-$(CONFIG_USB_EHCI) += drivers/usb/ehci_rh.o -TARGETS-$(CONFIG_USB_XHCI) += drivers/usb/xhci.o -TARGETS-$(CONFIG_USB_XHCI) += drivers/usb/xhci_rh.o -TARGETS-$(CONFIG_USB_HID) += drivers/usb/usbhid.o -TARGETS-$(CONFIG_USB_MSC) += drivers/usb/usbmsc.o +libc-$(CONFIG_USB) += usb/usbinit.c +libc-$(CONFIG_USB) += usb/usb.c +libc-$(CONFIG_USB) += usb/usb_dev.c +libc-$(CONFIG_USB) += usb/quirks.c +libc-$(CONFIG_USB_HUB) += usb/usbhub.c +libc-$(CONFIG_USB_UHCI) += usb/uhci.c +libc-$(CONFIG_USB_UHCI) += usb/uhci_rh.c +libc-$(CONFIG_USB_OHCI) += usb/ohci.c +libc-$(CONFIG_USB_OHCI) += usb/ohci_rh.c +libc-$(CONFIG_USB_EHCI) += usb/ehci.c +libc-$(CONFIG_USB_EHCI) += usb/ehci_rh.c +libc-$(CONFIG_USB_XHCI) += usb/xhci.c +libc-$(CONFIG_USB_XHCI) += usb/xhci_rh.c +libc-$(CONFIG_USB_HID) += usb/usbhid.c +libc-$(CONFIG_USB_MSC) += usb/usbmsc.c # used by both USB HID and keyboard -TARGETS-y += drivers/hid.o +libc-y += hid.c diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc index d629ccc..4ec2a02 100644 --- a/payloads/libpayload/libc/Makefile.inc +++ b/payloads/libpayload/libc/Makefile.inc @@ -28,12 +28,12 @@ ## SUCH DAMAGE. ## -TARGETS-$(CONFIG_LIBC) += libc/malloc.o libc/printf.o libc/console.o libc/string.o -TARGETS-$(CONFIG_LIBC) += libc/memory.o libc/ctype.o libc/ipchecksum.o libc/lib.o -TARGETS-$(CONFIG_LIBC) += libc/rand.o libc/time.o libc/exec.o -TARGETS-$(CONFIG_LIBC) += libc/readline.o libc/getopt_long.o libc/sysinfo.o -TARGETS-$(CONFIG_LIBC) += libc/args.o libc/strings.o +libc-$(CONFIG_LIBC) += malloc.c printf.c console.c string.c +libc-$(CONFIG_LIBC) += memory.c ctype.c ipchecksum.c lib.c +libc-$(CONFIG_LIBC) += rand.c time.c exec.c +libc-$(CONFIG_LIBC) += readline.c getopt_long.c sysinfo.c +libc-$(CONFIG_LIBC) += args.c strings.c # should be moved to coreboot directory -TARGETS-$(CONFIG_LAR) += libc/lar.o -#TARGETS-$(CONFIG_CBFS) += libc/cbfs.o +libc-$(CONFIG_LAR) += lar.c +#libc-$(CONFIG_CBFS) += cbfs.c diff --git a/payloads/libpayload/libpci/Makefile.inc b/payloads/libpayload/libpci/Makefile.inc index 5c3c3ea..f542acb 100644 --- a/payloads/libpayload/libpci/Makefile.inc +++ b/payloads/libpayload/libpci/Makefile.inc @@ -27,4 +27,4 @@ ## SUCH DAMAGE. ## -TARGETS-y += libpci/libpci.o +libpci-y += libpci.c

1 0

Patch merged into master: 28eb8e7 Improve VIA K8M890 HT settings. Use recommended settings for ROMSIP and for the transmit clock driving control. Unfortunately this is not enough to make the HT1000 work reliably, therefore blacklist this for now in CPU HT code. If ever anyone figure out what is wrong, it could be removed. The downgrading now makes the board work on HT800, which is certainly better than not at all with a HT1000 CPU.
by gerrit＠coreboot.org June 30, 2011

June 30, 2011

the following patch was just integrated into master: commit 28eb8e7d5a40ec62eca9e26cbdbf915788dc89a0 Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Wed Jun 29 23:47:20 2011 +0200 Improve VIA K8M890 HT settings. Use recommended settings for ROMSIP and for the transmit clock driving control. Unfortunately this is not enough to make the HT1000 work reliably, therefore blacklist this for now in CPU HT code. If ever anyone figure out what is wrong, it could be removed. The downgrading now makes the board work on HT800, which is certainly better than not at all with a HT1000 CPU. Change-Id: I949bfd9b0b48ee12bd0234c2fb1deaaa773bd235 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> See http://review.coreboot.org/68 for details. -gerrit

1 0

New patch to review: 3b0c61f Relicense Makefile to match libpayload
by Patrick Georgi June 30, 2011

June 30, 2011

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/70 -gerrit commit 3b0c61fd62a2775f54877d458539a516d9e0980c Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Thu Jun 30 15:48:57 2011 +0200 Relicense Makefile to match libpayload libpayload's license is more liberal than coreboot's. If we are to use the coreboot build system for libpayload (bringing a couple of new features to libpayload), we should adopt it for this shared part even if not strictly necessary. Change-Id: I1349616861e193b3e01407debbec3d82e09e72c2 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 5082f7e..44a1d63 100644 --- a/Makefile +++ b/Makefile @@ -6,18 +6,28 @@ ## Copyright (C) 2009-2010 coresystems GmbH ## Copyright (C) 2011 secunet Security Networks AG ## -## 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; version 2 of the License. +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions +## are met: +## 1. Redistributions of source code must retain the above copyright +## notice, this list of conditions and the following disclaimer. +## 2. Redistributions in binary form must reproduce the above copyright +## notice, this list of conditions and the following disclaimer in the +## documentation and/or other materials provided with the distribution. +## 3. The name of the author may not be used to endorse or promote products +## derived from this software without specific prior written permission. ## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. ## ifeq ($(INNER_SCANBUILD),y)

1 0

New patch to review: 28eb8e7 Improve VIA K8M890 HT settings. Use recommended settings for ROMSIP and for the transmit clock driving control. Unfortunately this is not enough to make the HT1000 work reliably, therefore blacklist this for now in CPU HT code. If ever anyone figure out what is wrong, it could be removed. The downgrading now makes the board work on HT800, which is certainly better than not at all with a HT1000 CPU.
by Rudolf Marek June 29, 2011

June 29, 2011

Rudolf Marek (r.marek(a)assembler.cz) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/68 -gerrit commit 28eb8e7d5a40ec62eca9e26cbdbf915788dc89a0 Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Wed Jun 29 23:47:20 2011 +0200 Improve VIA K8M890 HT settings. Use recommended settings for ROMSIP and for the transmit clock driving control. Unfortunately this is not enough to make the HT1000 work reliably, therefore blacklist this for now in CPU HT code. If ever anyone figure out what is wrong, it could be removed. The downgrading now makes the board work on HT800, which is certainly better than not at all with a HT1000 CPU. Change-Id: I949bfd9b0b48ee12bd0234c2fb1deaaa773bd235 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- src/northbridge/amd/amdk8/incoherent_ht.c | 7 +++++-- src/southbridge/via/k8t890/early_car.c | 2 ++ src/southbridge/via/k8t890/romstrap.inc | 22 +++++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/northbridge/amd/amdk8/incoherent_ht.c b/src/northbridge/amd/amdk8/incoherent_ht.c index 4b52092..4d0d025 100644 --- a/src/northbridge/amd/amdk8/incoherent_ht.c +++ b/src/northbridge/amd/amdk8/incoherent_ht.c @@ -148,8 +148,11 @@ static uint16_t ht_read_freq_cap(device_t dev, uint8_t pos) } printk(BIOS_SPEW, "pos=0x%x, filtered freq_cap=0x%x\n", pos, freq_cap); - //printk(BIOS_SPEW, "capping to 800/600/400/200 MHz\n"); - //freq_cap &= 0x3f; + + #if CONFIG_SOUTHBRIDGE_VIA_K8M890 == 1 + freq_cap &= 0x3f; + printk(BIOS_INFO, "Limiting HT to 800/600/400/200 MHz until K8M890 HT1000 is fixed.\n"); + #endif return freq_cap; } diff --git a/src/southbridge/via/k8t890/early_car.c b/src/southbridge/via/k8t890/early_car.c index 3fb7003..c554c49 100644 --- a/src/southbridge/via/k8t890/early_car.c +++ b/src/southbridge/via/k8t890/early_car.c @@ -77,6 +77,8 @@ u8 k8t890_early_setup_ht(void) print_debug("K8T800 Pro found at LDT "); #elif CONFIG_SOUTHBRIDGE_VIA_K8M890 print_debug("K8M890 found at LDT "); + /* K8M890 fix HT delay */ + pci_write_config8(PCI_DEV(0, 0x0, 2), 0xab, 0x22); #elif CONFIG_SOUTHBRIDGE_VIA_K8T890 print_debug("K8T890 found at LDT "); #endif diff --git a/src/southbridge/via/k8t890/romstrap.inc b/src/southbridge/via/k8t890/romstrap.inc index 4add008..5b24948 100644 --- a/src/southbridge/via/k8t890/romstrap.inc +++ b/src/southbridge/via/k8t890/romstrap.inc @@ -52,7 +52,27 @@ tblpointer: .long 0x0 .long 0x0 -#elif CONFIG_SOUTHBRIDGE_VIA_K8M890 || CONFIG_SOUTHBRIDGE_VIA_K8T890 +#elif CONFIG_SOUTHBRIDGE_VIA_K8M890 + +tblpointer: +.long 0x504400FF, 0x61970FC2 //;200M +.long 0x504400FF, 0x61970FC2 //;400M +.long 0x504400FF, 0x61970FC2 //;600M +.long 0x504400FF, 0x61970FC2 //;800M +.long 0x504400FF, 0x61970FC2 //;1000M +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 +.long 0x0 + + +#elif CONFIG_SOUTHBRIDGE_VIA_K8T890 tblpointer: .long 0x504400AA, 0x61970FC2 //;200M

1 0

New patch to review: f65442a We use LDTSTOP# to trigger the FID/VID change on K8M890, because the FID/VID SMAF is blocked by not yet configured internal VGA. Workaround the errata #181. The memory controller is enabled later, nor the workaround makes any harm to non-affected CPUs.
by Rudolf Marek June 29, 2011

June 29, 2011

Rudolf Marek (r.marek(a)assembler.cz) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/69 -gerrit commit f65442a479a1ace2badd1dcf2a5efd3e13dd226d Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Wed Jun 29 23:59:13 2011 +0200 We use LDTSTOP# to trigger the FID/VID change on K8M890, because the FID/VID SMAF is blocked by not yet configured internal VGA. Workaround the errata #181. The memory controller is enabled later, nor the workaround makes any harm to non-affected CPUs. Change-Id: Icf5d126b8c8cd9ece6af41d3129315a777c8cef2 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- src/mainboard/asus/m2v-mx_se/romstage.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c index 580d8fa..6498e46 100644 --- a/src/mainboard/asus/m2v-mx_se/romstage.c +++ b/src/mainboard/asus/m2v-mx_se/romstage.c @@ -74,10 +74,15 @@ static inline int spd_read_byte(unsigned device, unsigned address) #define SB_VFSMAF 0 -/* this function might fail on some K8 CPUs with errata #181 */ static void ldtstop_sb(void) { print_debug("toggle LDTSTP#\n"); + + /* fix errata #181, disable DRAM controller it will get enabled later */ + tmp = pci_read_config8(PCI_DEV(0, 0x18, 2), 0x94); + tmp |= (( 1 << 14) | (1 << 3)); + pci_write_config8(PCI_DEV(0, 0x18, 2), 0x94, tmp); + u8 reg = inb (VT8237R_ACPI_IO_BASE + 0x5c); reg = reg ^ (1 << 0); outb(reg, VT8237R_ACPI_IO_BASE + 0x5c);

1 0

Re: [coreboot] gerrit: patch iterations in email [was: differences between patchset iterations]
by Patrick Georgi June 29, 2011

June 29, 2011

Am Mittwoch, 15. Juni 2011 20:25:01, David Hendricks schrieb: > Is there an option to keep all these related updates and merges in a > single thread, ie do not display the patch's hash in the subject: line? I implemented it. Please report if it doesn't work for you, as mail threading is somewhat poorly specified. (for new changes, older ones might still appear as new threads) Patrick

1 0

Patch merged into master: 42270b4 Added support for Aaeon PFM-540I RevB PC104 SBC
by gerrit＠coreboot.org June 29, 2011

June 29, 2011

the following patch was just integrated into master: commit 42270b4c3c243d6ef91c0e470f3ac4137279085f Author: Mark Norman <mpnorman(a)gmail.com> Date: Tue Jun 14 22:20:37 2011 +0930 Added support for Aaeon PFM-540I RevB PC104 SBC The Aaeon PFM-540I RevB SBC is a PC104 SBC using a AMD Geode LX800 CPU. More infomation about the board available at www.aaeon.com. Change-Id: Ia8a3caacdc9ff1820a6c0a13a9a7ee758b929dfd Signed-off-by: Mark Norman <mpnorman(a)gmail.com> See http://review.coreboot.org/30 for details. -gerrit

1 0

Patch set updated: 42270b4 Added support for Aaeon PFM-540I RevB PC104 SBC
by Patrick Georgi June 29, 2011

June 29, 2011

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/30 -gerrit commit 42270b4c3c243d6ef91c0e470f3ac4137279085f Author: Mark Norman <mpnorman(a)gmail.com> Date: Tue Jun 14 22:20:37 2011 +0930 Added support for Aaeon PFM-540I RevB PC104 SBC The Aaeon PFM-540I RevB SBC is a PC104 SBC using a AMD Geode LX800 CPU. More infomation about the board available at www.aaeon.com. Change-Id: Ia8a3caacdc9ff1820a6c0a13a9a7ee758b929dfd Signed-off-by: Mark Norman <mpnorman(a)gmail.com> --- src/mainboard/Kconfig | 3 + src/mainboard/aaeon/Kconfig | 17 +++++ src/mainboard/aaeon/pfm-540i_revb/Kconfig | 28 +++++++ src/mainboard/aaeon/pfm-540i_revb/chip.h | 23 ++++++ src/mainboard/aaeon/pfm-540i_revb/devicetree.cb | 74 +++++++++++++++++++ src/mainboard/aaeon/pfm-540i_revb/irq_tables.c | 74 +++++++++++++++++++ src/mainboard/aaeon/pfm-540i_revb/mainboard.c | 38 ++++++++++ src/mainboard/aaeon/pfm-540i_revb/romstage.c | 89 +++++++++++++++++++++++ src/superio/smsc/smscsuperio/superio.c | 2 + 9 files changed, 348 insertions(+), 0 deletions(-) diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 77cf26a..ed00318 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -4,6 +4,8 @@ choice prompt "Mainboard vendor" default VENDOR_EMULATION +config VENDOR_AAEON + bool "Aaeon" config VENDOR_ABIT bool "Abit" config VENDOR_ADVANSUS @@ -122,6 +124,7 @@ config VENDOR_WYSE endchoice source "src/mainboard/a-trend/Kconfig" +source "src/mainboard/aaeon/Kconfig" source "src/mainboard/abit/Kconfig" source "src/mainboard/advansus/Kconfig" source "src/mainboard/advantech/Kconfig" diff --git a/src/mainboard/aaeon/Kconfig b/src/mainboard/aaeon/Kconfig new file mode 100644 index 0000000..d335938 --- /dev/null +++ b/src/mainboard/aaeon/Kconfig @@ -0,0 +1,17 @@ +if VENDOR_AAEON + +choice + prompt "Mainboard model" + +config BOARD_AAEON_PFM_540I_REVB + bool "PFM-540I_REVB" + +endchoice + +source "src/mainboard/aaeon/pfm-540i_revb/Kconfig" + +config MAINBOARD_VENDOR + string + default "Aaeon" + +endif # VENDOR_AAEON diff --git a/src/mainboard/aaeon/pfm-540i_revb/Kconfig b/src/mainboard/aaeon/pfm-540i_revb/Kconfig new file mode 100644 index 0000000..3b31ffb --- /dev/null +++ b/src/mainboard/aaeon/pfm-540i_revb/Kconfig @@ -0,0 +1,28 @@ +if BOARD_AAEON_PFM_540I_REVB + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_X86 + select CPU_AMD_LX + select NORTHBRIDGE_AMD_LX + select SOUTHBRIDGE_AMD_CS5536 + select SUPERIO_SMSC_SMSCSUPERIO + select HAVE_PIRQ_TABLE + select PIRQ_ROUTE + select UDELAY_TSC + select BOARD_ROMSIZE_KB_1024 + select POWER_BUTTON_FORCE_ENABLE + +config MAINBOARD_DIR + string + default aaeon/pfm-540i_revb + +config MAINBOARD_PART_NUMBER + string + default "PFM-540I_REVB" + +config IRQ_SLOT_COUNT + int + default 4 + +endif # BOARD_AAEON_PFM_540I_REVB diff --git a/src/mainboard/aaeon/pfm-540i_revb/chip.h b/src/mainboard/aaeon/pfm-540i_revb/chip.h new file mode 100644 index 0000000..c8c54b0 --- /dev/null +++ b/src/mainboard/aaeon/pfm-540i_revb/chip.h @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Mark Norman <mpnorman(a)gmail.com> + * + * 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +extern struct chip_operations mainboard_ops; + +struct mainboard_config {}; diff --git a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb new file mode 100644 index 0000000..b049160 --- /dev/null +++ b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb @@ -0,0 +1,74 @@ +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 + register "lpc_serirq_enable" = "0x0000105a" + register "lpc_serirq_polarity" = "0x0000EFA5" + register "lpc_serirq_mode" = "1" + register "enable_gpio_int_route" = "0x0D0C0700" + register "enable_ide_nand_flash" = "0" # 0:ide mode, 1:flash + register "enable_USBP4_device" = "1" # 0: host, 1:device + register "enable_USBP4_overcurrent" = "0" #0:off, xxxx:overcurrent setting CS5536 Data Book (pages 380-381) + register "com1_enable" = "0" + register "com1_address" = "0x3E8" + register "com1_irq" = "4" + register "com2_enable" = "0" + register "com2_address" = "0x2E8" + register "com2_irq" = "3" + register "unwanted_vpci[0]" = "0" # End of list has a zero + device pci c.0 on end # ISA Bridge (PC104) + device pci e.0 on end # Ethernet + device pci f.0 on # ISA Bridge + chip superio/smsc/smscsuperio + device pnp 4e.0 off # Floppy + io 0x60 = 0x3f0 + irq 0x70 = 6 + drq 0x74 = 2 + end + device pnp 4e.3 on # Parallel port + io 0x60 = 0x378 + irq 0x70 = 7 + end + device pnp 4e.4 on # Com1 + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 4e.5 on # Com2 + io 0x60 = 0x2f8 + irq 0x70 = 3 + end + device pnp 4e.7 on # Keyboard + irq 0x70 = 1 + irq 0x72 = 12 + end + device pnp 4e.a off end # Runtime/ACPI + + # superio/smsc/smscsuperio currently only supports the first 2 serial ports. + device pnp 4e.b off # Com3 + io 0x60 = 0x3e8 + irq 0x70 = 10 + end + device pnp 4e.c off # Com4 + io 0x60 = 0x2e8 + irq 0x70 = 11 + end + end + end + device pci f.2 on end # IDE Controller + device pci f.4 on end # OHCI + device pci f.5 on end # EHCI + end + end + # APIC cluster is late CPU init. + device lapic_cluster 0 on + chip cpu/amd/model_lx + device lapic 0 on end + end + end +end + diff --git a/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c b/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c new file mode 100644 index 0000000..599f7bd --- /dev/null +++ b/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c @@ -0,0 +1,74 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2007 Advanced Micro Devices, Inc. + * Copyright (C) 2011 Mark Norman <mpnorman(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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> +#include <arch/pirq_routing.h> +#include "southbridge/amd/cs5536/cs5536.h" + +/* Platform IRQs */ +#define PIRQA 5 +#define PIRQB 11 +#define PIRQC 10 +#define PIRQD 9 + +/* Map */ +#define M_PIRQA (1 << PIRQA) /* Bitmap of supported IRQs */ +#define M_PIRQB (1 << PIRQB) /* Bitmap of supported IRQs */ +#define M_PIRQC (1 << PIRQC) /* Bitmap of supported IRQs */ +#define M_PIRQD (1 << PIRQD) /* Bitmap of supported IRQs */ + +/* Link */ +#define L_PIRQA 1 /* Means Slot INTx# Connects To Chipset INTA# */ +#define L_PIRQB 2 /* Means Slot INTx# Connects To Chipset INTB# */ +#define L_PIRQC 3 /* Means Slot INTx# Connects To Chipset INTC# */ +#define L_PIRQD 4 /* Means Slot INTx# Connects To Chipset INTD# */ + +const struct irq_routing_table intel_irq_routing_table = { + PIRQ_SIGNATURE, /* u32 signature */ + PIRQ_VERSION, /* u16 version */ + 32 + 16 * CONFIG_IRQ_SLOT_COUNT, /* there can be total CONFIG_IRQ_SLOT_COUNT devices on the bus */ + 0x00, /* Where the interrupt router lies (bus) */ + (0x0F << 3) | 0x0, /* Where the interrupt router lies (dev) */ + 0x00, /* IRQs devoted exclusively to PCI usage */ + 0x100B, /* Vendor */ + 0x002B, /* Device */ + 0, /* Miniport data */ + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* u8 rfu[11] */ + 0x00, /* u8 checksum , this has to set to some value that would give 0 after the sum of all bytes for this structure (including checksum) */ + { + /* If you change the number of entries, change the CONFIG_IRQ_SLOT_COUNT above! */ + /* bus, dev|fn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu */ + /* CPU */ + {0x00, (0x01 << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, + /* Ethernet */ + {0x00, (0x0E << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, + /* Chipset */ + {0x00, (0x0F << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x0, 0x0}, + } +}; + +unsigned long write_pirq_routing_table(unsigned long addr) +{ + return copy_pirq_routing_table(addr); +} diff --git a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c new file mode 100644 index 0000000..72e500c --- /dev/null +++ b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c @@ -0,0 +1,38 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Mark Norman <mpnorman(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <console/console.h> +#include <device/device.h> +#include "chip.h" + +static void init(struct device *dev) +{ + printk(BIOS_DEBUG, "AAEON PFM-540I_REVB ENTER %s\n", __func__); + printk(BIOS_DEBUG, "AAEON PFM-540I_REVB EXIT %s\n", __func__); +} + +static void enable_dev(struct device *dev) +{ + dev->ops->init = init; +} + +struct chip_operations mainboard_ops = { + CHIP_NAME("AAEON PFM-540I_REVB Mainboard") + .enable_dev = enable_dev, +}; diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c new file mode 100644 index 0000000..b638a07 --- /dev/null +++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c @@ -0,0 +1,89 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2007 Advanced Micro Devices, Inc. + * Copyright (C) 2011 Mark Norman <mpnorman(a)gmail.com> + * + * 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* Based on romstage.c from AMD's DB800 mainboard. */ + +#include <stdint.h> +#include <stdlib.h> +#include <device/pci_def.h> +#include <arch/io.h> +#include <device/pnp_def.h> +#include <arch/hlt.h> +#include <console/console.h> +#include "cpu/x86/bist.h" +#include "cpu/x86/msr.h" +#include <cpu/amd/lxdef.h> +#include "southbridge/amd/cs5536/cs5536.h" +#include <spd.h> +#include "southbridge/amd/cs5536/early_smbus.c" +#include "southbridge/amd/cs5536/early_setup.c" +#include "superio/smsc/smscsuperio/early_serial.c" + +#define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) + +static inline int spd_read_byte(unsigned int device, unsigned int address) +{ + if (device != DIMM0) + return 0xFF; /* No DIMM1, don't even try. */ + + return smbus_read_byte(device, address); +} + +#define ManualConf 0 /* Do automatic strapped PLL config */ +#define PLLMSRhi 0x000005DD /* Manual settings for the PLL */ +#define PLLMSRlo 0x00DE60EE + +#include "northbridge/amd/lx/raminit.h" +#include "northbridge/amd/lx/pll_reset.c" +#include "northbridge/amd/lx/raminit.c" +#include "lib/generic_sdram.c" +#include "cpu/amd/model_lx/cpureginit.c" +#include "cpu/amd/model_lx/syspreinit.c" +#include "cpu/amd/model_lx/msrinit.c" + +void main(unsigned long bist) +{ + static const struct mem_controller memctrl[] = { + {.channel0 = {DIMM0, DIMM1}} + }; + + SystemPreInit(); + msr_init(); + + cs5536_early_setup(); + + /* Note: must do this AFTER the early_setup! It is counting on some + * early MSR setup for CS5536. + */ + smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + console_init(); + + /* Halt if there was a built in self test failure */ + report_bist_failure(bist); + + pll_reset(ManualConf); + + cpuRegInit(0, DIMM0, DIMM1, DRAM_TERMINATED); + + sdram_initialize(1, memctrl); + + /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ +} diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index 4026aff..a2358a4 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -59,6 +59,7 @@ #define A8000 0x77 /* ASUS A8000, a rebranded DME1737(?) */ #define DME1737 0x78 #define SCH3112 0x7c +#define SCH3114 0x7d #define SCH5307 0x81 /* Rebranded LPC47B397(?) */ #define SCH5027D 0x89 #define SCH4304 0x90 /* SCH4304, SCH4307 */ @@ -136,6 +137,7 @@ static const struct logical_devices { {A8000, {0, 3, 4, 5, -1, 7, -1, -1, -1, -1, -1, -1, 10, -1, -1}}, {DME1737, {0, 3, 4, 5, -1, 7, -1, -1, -1, -1, -1, -1, 10, -1, -1}}, {SCH3112, {0, 3, 4, 5, -1, 7, -1, -1, -1, -1, -1, -1, 10, -1, -1}}, + {SCH3114, {0, 3, 4, 5, -1, 7, -1, -1, -1, -1, -1, -1, 10, -1, -1}}, {SCH5307, {0, 3, 4, 5, -1, 7, -1, -1, 8, -1, -1, -1, 10, -1, -1}}, {SCH5027D, {0, 3, 4, 5, -1, 7, -1, -1, -1, -1, -1, -1, 10, -1, 11}}, {SCH4304, {0, 3, 4, 5, -1, 7, -1, 11, -1, -1, -1, -1, 10, -1, -1}},

1 0