coreboot December 2010

coreboot@coreboot.org

52 participants
262 discussions

build service results for r6191
by repository service 17 Dec '10

17 Dec '10

1 0

[commit] r6194 - trunk/src/include/console
by repository service 17 Dec '10

17 Dec '10

Author: stepan Date: Fri Dec 17 02:51:34 2010 New Revision: 6194 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6194 Log: fix the tree again. Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/include/console/console.h Modified: trunk/src/include/console/console.h ============================================================================== --- trunk/src/include/console/console.h Fri Dec 17 02:27:22 2010 (r6193) +++ trunk/src/include/console/console.h Fri Dec 17 02:51:34 2010 (r6194) @@ -54,6 +54,9 @@ * we could use the same code on all architectures. */ #define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL +#if CONFIG_CONSOLE_SERIAL8250 +#include <uart8250.h> +#endif #endif #ifndef __ROMCC__ @@ -148,14 +151,15 @@ #define print_spew_hex32(HEX) printk(BIOS_SPEW, "%08x", (HEX)) #else +/* __ROMCC__ */ + #if CONFIG_CONSOLE_SERIAL8250 -#include "lib/uart8259.c" +#include "lib/uart8250.c" #endif #if CONFIG_CONSOLE_NE2K #include "lib/ne2k.c" #endif -/* __ROMCC__ */ static void __console_tx_byte(unsigned char byte) { #if CONFIG_CONSOLE_SERIAL8250

1 0

[commit] r6192 - in trunk: src/superio src/superio/fintek src/superio/intel src/superio/ite src/superio/nsc src/superio/nsc/pc87427 src/superio/renesas src/superio/serverengines src/superio/smsc sr...
by repository service 17 Dec '10

17 Dec '10

Author: stepan Date: Fri Dec 17 01:13:54 2010 New Revision: 6192 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6192 Log: add license headers to some trivial files and pc87427.h Mostly done according to initial file creator. Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/superio/Kconfig trunk/src/superio/Makefile.inc trunk/src/superio/fintek/Kconfig trunk/src/superio/fintek/Makefile.inc trunk/src/superio/intel/Kconfig trunk/src/superio/intel/Makefile.inc trunk/src/superio/ite/Kconfig trunk/src/superio/ite/Makefile.inc trunk/src/superio/nsc/Kconfig trunk/src/superio/nsc/Makefile.inc trunk/src/superio/nsc/pc87427/pc87427.h trunk/src/superio/renesas/Kconfig trunk/src/superio/renesas/Makefile.inc trunk/src/superio/serverengines/Kconfig trunk/src/superio/smsc/Kconfig trunk/src/superio/smsc/Makefile.inc trunk/src/superio/via/Kconfig trunk/src/superio/via/Makefile.inc trunk/src/superio/winbond/Kconfig trunk/src/superio/winbond/Makefile.inc trunk/util/ectool/Makefile trunk/util/k8resdump/Makefile trunk/util/nvramtool/Makefile Modified: trunk/src/superio/Kconfig ============================================================================== --- trunk/src/superio/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + source src/superio/fintek/Kconfig source src/superio/intel/Kconfig source src/superio/ite/Kconfig Modified: trunk/src/superio/Makefile.inc ============================================================================== --- trunk/src/superio/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1,9 +1,28 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += fintek subdirs-y += intel subdirs-y += ite subdirs-y += nsc subdirs-y += renesas -# subdirs-y += serverengines +#subdirs-y += serverengines subdirs-y += smsc subdirs-y += via subdirs-y += winbond Modified: trunk/src/superio/fintek/Kconfig ============================================================================== --- trunk/src/superio/fintek/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/fintek/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + config SUPERIO_FINTEK_F71805F bool config SUPERIO_FINTEK_F71859 Modified: trunk/src/superio/fintek/Makefile.inc ============================================================================== --- trunk/src/superio/fintek/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/fintek/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += f71805f subdirs-y += f71859 subdirs-y += f71863fg Modified: trunk/src/superio/intel/Kconfig ============================================================================== --- trunk/src/superio/intel/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/intel/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,2 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + config SUPERIO_INTEL_I3100 bool Modified: trunk/src/superio/intel/Makefile.inc ============================================================================== --- trunk/src/superio/intel/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/intel/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1 +1,20 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += i3100 Modified: trunk/src/superio/ite/Kconfig ============================================================================== --- trunk/src/superio/ite/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/ite/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,23 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + + config SUPERIO_ITE_IT8661F bool config SUPERIO_ITE_IT8671F Modified: trunk/src/superio/ite/Makefile.inc ============================================================================== --- trunk/src/superio/ite/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/ite/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += it8661f subdirs-y += it8671f subdirs-y += it8673f Modified: trunk/src/superio/nsc/Kconfig ============================================================================== --- trunk/src/superio/nsc/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/nsc/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,23 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + + config SUPERIO_NSC_PC8374 bool config SUPERIO_NSC_PC87309 Modified: trunk/src/superio/nsc/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/nsc/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += pc8374 subdirs-y += pc87309 subdirs-y += pc87351 Modified: trunk/src/superio/nsc/pc87427/pc87427.h ============================================================================== --- trunk/src/superio/nsc/pc87427/pc87427.h Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/nsc/pc87427/pc87427.h Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,24 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2000 AG Electronics Ltd. + * Copyright (C) 2003-2004 Linux Networx + * + * 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 + */ + #ifndef SUPERIO_NSC_PC87427_PC87427_H #define SUPERIO_NSC_PC87427_PC87427_H Modified: trunk/src/superio/renesas/Kconfig ============================================================================== --- trunk/src/superio/renesas/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/renesas/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,2 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 coresystems GmbH +## +## 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. +## +## 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 +## + config SUPERIO_RENESAS_M3885X bool Modified: trunk/src/superio/renesas/Makefile.inc ============================================================================== --- trunk/src/superio/renesas/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/renesas/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1 +1,20 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 coresystems GmbH +## +## 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. +## +## 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 +## + subdirs-y += m3885x Modified: trunk/src/superio/serverengines/Kconfig ============================================================================== --- trunk/src/superio/serverengines/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/serverengines/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,2 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + config SUPERIO_SERVERENGINES_PILOT bool Modified: trunk/src/superio/smsc/Kconfig ============================================================================== --- trunk/src/superio/smsc/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/smsc/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + config SUPERIO_SMSC_FDC37M60X bool config SUPERIO_SMSC_FDC37N972 Modified: trunk/src/superio/smsc/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/smsc/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += fdc37m60x subdirs-y += fdc37n972 subdirs-y += lpc47b272 Modified: trunk/src/superio/via/Kconfig ============================================================================== --- trunk/src/superio/via/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/via/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,2 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + config SUPERIO_VIA_VT1211 bool Modified: trunk/src/superio/via/Makefile.inc ============================================================================== --- trunk/src/superio/via/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/via/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1 +1,20 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += vt1211 Modified: trunk/src/superio/winbond/Kconfig ============================================================================== --- trunk/src/superio/winbond/Kconfig Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/winbond/Kconfig Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + config SUPERIO_WINBOND_W83627DHG bool config SUPERIO_WINBOND_W83627EHG Modified: trunk/src/superio/winbond/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/src/superio/winbond/Makefile.inc Fri Dec 17 01:13:54 2010 (r6192) @@ -1,3 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2009 Ronald G. Minnich +## +## 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. +## +## 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 +## + subdirs-y += w83627dhg subdirs-y += w83627ehg subdirs-y += w83627hf Modified: trunk/util/ectool/Makefile ============================================================================== --- trunk/util/ectool/Makefile Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/util/ectool/Makefile Fri Dec 17 01:13:54 2010 (r6192) @@ -1,23 +1,22 @@ -# -# Makefile for ectool -# -# Copyright (C) 2009 by coresystems GmbH -# written by Stefan Reinauer <stepan(a)coresystems.de> -# -# 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# +## +## Makefile for ectool +## +## Copyright (C) 2009 by coresystems GmbH +## written by Stefan Reinauer <stepan(a)coresystems.de> +## +## 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. +## +## 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 +## CC = gcc CFLAGS = -O2 -Wall -W Modified: trunk/util/k8resdump/Makefile ============================================================================== --- trunk/util/k8resdump/Makefile Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/util/k8resdump/Makefile Fri Dec 17 01:13:54 2010 (r6192) @@ -1,8 +1,21 @@ -# -# Makefile for k8redump utility -# -# Original from Stefan Reinauer <stepan(a)openbios.org> -# +## +## Makefile for k8resdump utility +## +## (C) 2005 coresystems GmbH +## +## 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. +## +## 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 +## PROGRAM = k8resdump Modified: trunk/util/nvramtool/Makefile ============================================================================== --- trunk/util/nvramtool/Makefile Fri Dec 17 01:08:21 2010 (r6191) +++ trunk/util/nvramtool/Makefile Fri Dec 17 01:13:54 2010 (r6192) @@ -1,9 +1,22 @@ -# -# Makefile for nvram utility -# -# (C) 2005-2008 coresystems GmbH -# written by Stefan Reinauer <stepan(a)coresystems.de> -# +## +## Makefile for nvram utility +## +## (C) 2005-2008 coresystems GmbH +## written by Stefan Reinauer <stepan(a)coresystems.de> +## +## 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. +## +## 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 +## PROGRAM = nvramtool

1 0

[commit] r6191 - in trunk/src: console include include/console lib mainboard/amd/serengeti_cheetah mainboard/gigabyte/ga_2761gxdk mainboard/gigabyte/m57sli mainboard/msi/ms7260 mainboard/nvidia/l1_...
by repository service 17 Dec '10

17 Dec '10

Author: stepan Date: Fri Dec 17 01:08:21 2010 New Revision: 6191 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6191 Log: drop one more version of doing serial uart output differently. coreboot made it kind of complicated to print a character on serial. Not quite as complicated as UEFI, but too much for a good design. Fix it. Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Deleted: trunk/src/pc80/serial.c Modified: trunk/src/console/uart8250_console.c trunk/src/include/console/console.h trunk/src/include/lib.h trunk/src/include/uart8250.h trunk/src/lib/uart8250.c trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c trunk/src/mainboard/msi/ms7260/ap_romstage.c trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c trunk/src/mainboard/supermicro/h8dme/ap_romstage.c trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c trunk/src/mainboard/tyan/s2912/ap_romstage.c trunk/src/northbridge/via/cx700/early_serial.c trunk/src/northbridge/via/vx800/examples/romstage.c trunk/src/pc80/Makefile.inc Modified: trunk/src/console/uart8250_console.c ============================================================================== --- trunk/src/console/uart8250_console.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/console/uart8250_console.c Fri Dec 17 01:08:21 2010 (r6191) @@ -1,41 +1,36 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2003 Eric Biederman + * + * 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. + * + * 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 <uart8250.h> #include <pc80/mc146818rtc.h> -/* Base Address */ -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3f8 -#endif - -#ifndef CONFIG_TTYS0_BAUD -#define CONFIG_TTYS0_BAUD 115200 -#endif - -#ifndef CONFIG_TTYS0_DIV -#if ((115200%CONFIG_TTYS0_BAUD) != 0) -#error Bad ttys0 baud rate -#endif -#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) -#endif - -/* Line Control Settings */ -#ifndef CONFIG_TTYS0_LCS -/* Set 8bit, 1 stop bit, no parity */ -#define CONFIG_TTYS0_LCS 0x3 -#endif - -#define UART_LCS CONFIG_TTYS0_LCS - static void ttyS0_init(void) { - static const unsigned char div[8]={1,2,3,6,12,24,48,96}; - int b_index=0; - unsigned int divisor=CONFIG_TTYS0_DIV; + static const unsigned char div[8] = { 1, 2, 3, 6, 12, 24, 48, 96 }; + int b_index = 0; + unsigned int divisor = CONFIG_TTYS0_DIV; - if(get_option(&b_index,"baud_rate")==0) { - divisor=div[b_index]; + if (get_option(&b_index, "baud_rate") == 0) { + divisor = div[b_index]; } - uart8250_init(CONFIG_TTYS0_BASE, divisor, CONFIG_TTYS0_LCS); + uart8250_init(CONFIG_TTYS0_BASE, divisor); } static void ttyS0_tx_byte(unsigned char data) @@ -54,9 +49,8 @@ } static const struct console_driver uart8250_console __console = { - .init = ttyS0_init, - .tx_byte = ttyS0_tx_byte, - .rx_byte = ttyS0_rx_byte, + .init = ttyS0_init, + .tx_byte = ttyS0_tx_byte, + .rx_byte = ttyS0_rx_byte, .tst_byte = ttyS0_tst_byte, }; - Modified: trunk/src/include/console/console.h ============================================================================== --- trunk/src/include/console/console.h Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/include/console/console.h Fri Dec 17 01:08:21 2010 (r6191) @@ -148,8 +148,9 @@ #define print_spew_hex32(HEX) printk(BIOS_SPEW, "%08x", (HEX)) #else -#include <pc80/serial.c> - +#if CONFIG_CONSOLE_SERIAL8250 +#include "lib/uart8259.c" +#endif #if CONFIG_CONSOLE_NE2K #include "lib/ne2k.c" #endif @@ -157,7 +158,9 @@ /* __ROMCC__ */ static void __console_tx_byte(unsigned char byte) { - uart_tx_byte(byte); +#if CONFIG_CONSOLE_SERIAL8250 + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); +#endif #if CONFIG_CONSOLE_NE2K ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); #endif @@ -176,10 +179,12 @@ static void __console_tx_char(int loglevel, unsigned char byte) { if (console_loglevel >= loglevel) { - uart_tx_byte(byte); +#if CONFIG_CONSOLE_SERIAL8250 + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); +#endif #if CONFIG_CONSOLE_NE2K - ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); - ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); + ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); #endif } } Modified: trunk/src/include/lib.h ============================================================================== --- trunk/src/include/lib.h Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/include/lib.h Fri Dec 17 01:08:21 2010 (r6191) @@ -39,9 +39,6 @@ void ram_check(unsigned long start, unsigned long stop); void quick_ram_check(void); -/* Defined in src/pc80/serial.c */ -void uart_init(void); - /* Defined in romstage.c */ #if defined(CONFIG_CPU_AMD_LX) && CONFIG_CPU_AMD_LX void cache_as_ram_main(void); Modified: trunk/src/include/uart8250.h ============================================================================== --- trunk/src/include/uart8250.h Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/include/uart8250.h Fri Dec 17 01:08:21 2010 (r6191) @@ -1,15 +1,151 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2003 Eric Biederman + * + * 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. + * + * 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 + */ + #ifndef UART8250_H #define UART8250_H +/* Base Address */ +#ifndef CONFIG_TTYS0_BASE +#define CONFIG_TTYS0_BASE 0x3f8 +#endif + +#ifndef CONFIG_TTYS0_BAUD +#define CONFIG_TTYS0_BAUD 115200 +#endif + +#ifndef CONFIG_TTYS0_DIV +#if ((115200%CONFIG_TTYS0_BAUD) != 0) +#error Bad ttys0 baud rate +#endif +#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) +#endif + +/* Line Control Settings */ +#ifndef CONFIG_TTYS0_LCS +/* Set 8bit, 1 stop bit, no parity */ +#define CONFIG_TTYS0_LCS 0x3 +#endif + +#define UART_LCS CONFIG_TTYS0_LCS + + +/* Data */ +#define UART_RBR 0x00 +#define UART_TBR 0x00 + +/* Control */ +#define UART_IER 0x01 +#define UART_IER_MSI 0x08 /* Enable Modem status interrupt */ +#define UART_IER_RLSI 0x04 /* Enable receiver line status interrupt */ +#define UART_IER_THRI 0x02 /* Enable Transmitter holding register int. */ +#define UART_IER_RDI 0x01 /* Enable receiver data interrupt */ + +#define UART_IIR 0x02 +#define UART_IIR_NO_INT 0x01 /* No interrupts pending */ +#define UART_IIR_ID 0x06 /* Mask for the interrupt ID */ + +#define UART_IIR_MSI 0x00 /* Modem status interrupt */ +#define UART_IIR_THRI 0x02 /* Transmitter holding register empty */ +#define UART_IIR_RDI 0x04 /* Receiver data interrupt */ +#define UART_IIR_RLSI 0x06 /* Receiver line status interrupt */ + +#define UART_FCR 0x02 +#define UART_FCR_FIFO_EN 0x01 /* Fifo enable */ +#define UART_FCR_CLEAR_RCVR 0x02 /* Clear the RCVR FIFO */ +#define UART_FCR_CLEAR_XMIT 0x04 /* Clear the XMIT FIFO */ +#define UART_FCR_DMA_SELECT 0x08 /* For DMA applications */ +#define UART_FCR_TRIGGER_MASK 0xC0 /* Mask for the FIFO trigger range */ +#define UART_FCR_TRIGGER_1 0x00 /* Mask for trigger set at 1 */ +#define UART_FCR_TRIGGER_4 0x40 /* Mask for trigger set at 4 */ +#define UART_FCR_TRIGGER_8 0x80 /* Mask for trigger set at 8 */ +#define UART_FCR_TRIGGER_14 0xC0 /* Mask for trigger set at 14 */ + +#define UART_FCR_RXSR 0x02 /* Receiver soft reset */ +#define UART_FCR_TXSR 0x04 /* Transmitter soft reset */ + +#define UART_LCR 0x03 +#define UART_LCR_WLS_MSK 0x03 /* character length select mask */ +#define UART_LCR_WLS_5 0x00 /* 5 bit character length */ +#define UART_LCR_WLS_6 0x01 /* 6 bit character length */ +#define UART_LCR_WLS_7 0x02 /* 7 bit character length */ +#define UART_LCR_WLS_8 0x03 /* 8 bit character length */ +#define UART_LCR_STB 0x04 /* Number of stop Bits, off = 1, on = 1.5 or 2) */ +#define UART_LCR_PEN 0x08 /* Parity eneble */ +#define UART_LCR_EPS 0x10 /* Even Parity Select */ +#define UART_LCR_STKP 0x20 /* Stick Parity */ +#define UART_LCR_SBRK 0x40 /* Set Break */ +#define UART_LCR_BKSE 0x80 /* Bank select enable */ +#define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ + +#define UART_MCR 0x04 +#define UART_MCR_DTR 0x01 /* DTR */ +#define UART_MCR_RTS 0x02 /* RTS */ +#define UART_MCR_OUT1 0x04 /* Out 1 */ +#define UART_MCR_OUT2 0x08 /* Out 2 */ +#define UART_MCR_LOOP 0x10 /* Enable loopback test mode */ + +#define UART_MCR_DMA_EN 0x04 +#define UART_MCR_TX_DFR 0x08 + +#define UART_DLL 0x00 +#define UART_DLM 0x01 + +/* Status */ +#define UART_LSR 0x05 +#define UART_LSR_DR 0x01 /* Data ready */ +#define UART_LSR_OE 0x02 /* Overrun */ +#define UART_LSR_PE 0x04 /* Parity error */ +#define UART_LSR_FE 0x08 /* Framing error */ +#define UART_LSR_BI 0x10 /* Break */ +#define UART_LSR_THRE 0x20 /* Xmit holding register empty */ +#define UART_LSR_TEMT 0x40 /* Xmitter empty */ +#define UART_LSR_ERR 0x80 /* Error */ + +#define UART_MSR 0x06 +#define UART_MSR_DCD 0x80 /* Data Carrier Detect */ +#define UART_MSR_RI 0x40 /* Ring Indicator */ +#define UART_MSR_DSR 0x20 /* Data Set Ready */ +#define UART_MSR_CTS 0x10 /* Clear to Send */ +#define UART_MSR_DDCD 0x08 /* Delta DCD */ +#define UART_MSR_TERI 0x04 /* Trailing edge ring indicator */ +#define UART_MSR_DDSR 0x02 /* Delta DSR */ +#define UART_MSR_DCTS 0x01 /* Delta CTS */ + +#define UART_SCR 0x07 + + +#ifndef __ROMCC__ +// Can't we just drop this? It seems silly. struct uart8250 { unsigned int baud; - /* Do I need an lcs parameter here? */ }; unsigned char uart8250_rx_byte(unsigned base_port); int uart8250_can_rx_byte(unsigned base_port); void uart8250_tx_byte(unsigned base_port, unsigned char data); -void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs); + +/* Yes it is silly to have three different uart init functions. But we used to + * have three different sets of uart code, so it's an improvement. + */ +void uart8250_init(unsigned base_port, unsigned divisor); void init_uart8250(unsigned base_port, struct uart8250 *uart); +void uart_init(void); +#endif #endif /* UART8250_H */ Modified: trunk/src/lib/uart8250.c ============================================================================== --- trunk/src/lib/uart8250.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/lib/uart8250.c Fri Dec 17 01:08:21 2010 (r6191) @@ -1,28 +1,36 @@ -/* Should support 8250, 16450, 16550, 16550A type uarts */ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2003 Eric Biederman + * Copyright (C) 2006-2010 coresystems GmbH + * + * 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. + * + * 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 <arch/io.h> #include <uart8250.h> +#include <pc80/mc146818rtc.h> +#if CONFIG_USE_OPTION_TABLE +#include "option_table.h" +#endif + -/* Data */ -#define UART_RBR 0x00 -#define UART_TBR 0x00 - -/* Control */ -#define UART_IER 0x01 -#define UART_IIR 0x02 -#define UART_FCR 0x02 -#define UART_LCR 0x03 -#define UART_MCR 0x04 -#define UART_DLL 0x00 -#define UART_DLM 0x01 - -/* Status */ -#define UART_LSR 0x05 -#define UART_MSR 0x06 -#define UART_SCR 0x07 +/* Should support 8250, 16450, 16550, 16550A type UARTs */ static inline int uart8250_can_tx_byte(unsigned base_port) { - return inb(base_port + UART_LSR) & 0x20; + return inb(base_port + UART_LSR) & UART_MSR_DSR; } static inline void uart8250_wait_to_tx_byte(unsigned base_port) @@ -33,7 +41,7 @@ static inline void uart8250_wait_until_sent(unsigned base_port) { - while(!(inb(base_port + UART_LSR) & 0x40)) + while(!(inb(base_port + UART_LSR) & UART_LSR_TEMT)) ; } @@ -47,7 +55,7 @@ int uart8250_can_rx_byte(unsigned base_port) { - return inb(base_port + UART_LSR) & 0x01; + return inb(base_port + UART_LSR) & UART_LSR_DR; } unsigned char uart8250_rx_byte(unsigned base_port) @@ -57,34 +65,56 @@ return inb(base_port + UART_RBR); } -void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs) +void uart8250_init(unsigned base_port, unsigned divisor) { - lcs &= 0x7f; - /* disable interrupts */ + /* Disable interrupts */ outb(0x0, base_port + UART_IER); - /* enable fifo's */ - outb(0x01, base_port + UART_FCR); + /* Enable FIFOs */ + outb(UART_FCR_FIFO_EN, base_port + UART_FCR); + /* assert DTR and RTS so the other end is happy */ - outb(0x03, base_port + UART_MCR); - /* Set Baud Rate Divisor to 12 ==> 115200 Baud */ - outb(0x80 | lcs, base_port + UART_LCR); + outb(UART_MCR_DTR | UART_MCR_RTS, base_port + UART_MCR); + + /* DLAB on */ + outb(UART_LCR_DLAB | CONFIG_TTYS0_LCS, base_port + UART_LCR); + + /* Set Baud Rate Divisor. 12 ==> 115200 Baud */ outb(divisor & 0xFF, base_port + UART_DLL); outb((divisor >> 8) & 0xFF, base_port + UART_DLM); - outb(lcs, base_port + UART_LCR); + + /* Set to 3 for 8N1 */ + outb(CONFIG_TTYS0_LCS, base_port + UART_LCR); } +#ifndef __ROMCC__ /* Initialize a generic uart */ void init_uart8250(unsigned base_port, struct uart8250 *uart) { - int divisor; - int lcs; - divisor = 115200/(uart->baud ? uart->baud: 1); - lcs = 3; + int divisor = uart->baud ? (115200/uart->baud) : 1; + if (base_port == CONFIG_TTYS0_BASE) { /* Don't reinitialize the console serial port, * This is espeically nasty in SMP. + * NOTE: The first invocation thus always needs to be */ return; } - uart8250_init(base_port, divisor, lcs); + uart8250_init(base_port, divisor); } +#endif + +void uart_init(void) +{ +#if CONFIG_USE_OPTION_TABLE + static const unsigned char divisor[] = { 1, 2, 3, 6, 12, 24, 48, 96 }; + unsigned ttys0_div, ttys0_index; + ttys0_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0); + ttys0_index &= 7; + ttys0_div = divisor[ttys0_index]; + + uart8250_init(CONFIG_TTYS0_BASE, ttys0_div); +#else + uart8250_init(CONFIG_TTYS0_BASE, CONFIG_TTYS0_DIV); +#endif +} + Modified: trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -11,9 +11,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" -#include "./arch/x86/lib/printk_init.c" - #include "console/console.c" #include "lib/uart8250.c" #include "console/vtxprintf.c" Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -34,7 +34,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" #include "lib/uart8250.c" #include "arch/x86/lib/printk_init.c" Modified: trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -32,7 +32,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" #include "lib/uart8250.c" #include "arch/x86/lib/printk_init.c" Modified: trunk/src/mainboard/msi/ms7260/ap_romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/msi/ms7260/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -33,7 +33,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" +#include "lib/uart8259.c" #include "console/console.c" #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -32,8 +32,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" - #include "lib/uart8250.c" #include "arch/x86/lib/printk_init.c" #include "console/vtxprintf.c" @@ -45,7 +43,6 @@ #include "lib/delay.c" -//#include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" @@ -78,17 +75,15 @@ train_ram(id.nodeid, sysinfo, sysinfox); /* - go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp - */ + * go back, but can not use stack any more, because we only keep + * ret_addr and can not restore esp, and ebp + */ __asm__ volatile ( "movl %0, %%edi\n\t" "jmp *%%edi\n\t" :: "a"(ret_addr) ); - - - } #include <arch/registers.h> @@ -99,5 +94,3 @@ hlt(); } while(1); } - - Modified: trunk/src/mainboard/supermicro/h8dme/ap_romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/supermicro/h8dme/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -32,7 +32,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" #include "console/console.c" #include "lib/uart8250.c" @@ -82,17 +81,14 @@ train_ram(id.nodeid, sysinfo, sysinfox); /* - go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp - */ + * go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp + */ __asm__ volatile ( "movl %0, %%edi\n\t" "jmp *%%edi\n\t" :: "a"(ret_addr) ); - - - } #include <arch/registers.h> @@ -104,4 +100,3 @@ } while(1); } - Modified: trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -32,7 +32,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" #include "console/console.c" #include "lib/uart8250.c" Modified: trunk/src/mainboard/tyan/s2912/ap_romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/ap_romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/mainboard/tyan/s2912/ap_romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -32,8 +32,6 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <pc80/mc146818rtc.h> -#include "pc80/serial.c" - #include "console/console.c" #include <cpu/amd/model_fxx_rev.h> @@ -83,9 +81,6 @@ "jmp *%%edi\n\t" :: "a"(ret_addr) ); - - - } #include <arch/registers.h> @@ -97,4 +92,3 @@ } while(1); } - Modified: trunk/src/northbridge/via/cx700/early_serial.c ============================================================================== --- trunk/src/northbridge/via/cx700/early_serial.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/northbridge/via/cx700/early_serial.c Fri Dec 17 01:08:21 2010 (r6191) @@ -81,7 +81,7 @@ cx700_writepnpaddr(0xaa); // XXX This part should be fully taken care of by - // src/pc80/serial.c:uart_init + // src/lib/uart8250.c:uart_init // set up reg to set baud rate. cx700_writesiobyte(0x3fb, 0x80); Modified: trunk/src/northbridge/via/vx800/examples/romstage.c ============================================================================== --- trunk/src/northbridge/via/vx800/examples/romstage.c Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/northbridge/via/vx800/examples/romstage.c Fri Dec 17 01:08:21 2010 (r6191) @@ -28,7 +28,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" #include "console/console.c" #include "lib/ramtest.c" #include "northbridge/via/vx800/vx800.h" Modified: trunk/src/pc80/Makefile.inc ============================================================================== --- trunk/src/pc80/Makefile.inc Fri Dec 17 01:03:18 2010 (r6190) +++ trunk/src/pc80/Makefile.inc Fri Dec 17 01:08:21 2010 (r6191) @@ -5,7 +5,6 @@ ramstage-y += keyboard.c romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c -romstage-$(CONFIG_CACHE_AS_RAM) += serial.c romstage-$(CONFIG_USBDEBUG) += usbdebug_serial.c subdirs-y += vga

1 0

[commit] r6190 - trunk/src/include/cpu
by repository service 17 Dec '10

17 Dec '10

Author: stepan Date: Fri Dec 17 01:03:18 2010 New Revision: 6190 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6190 Log: guard against the case that CONFIG_WAIT_BEFORE_CPUS_INIT is not defined at all. Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/include/cpu/cpu.h Modified: trunk/src/include/cpu/cpu.h ============================================================================== --- trunk/src/include/cpu/cpu.h Fri Dec 17 00:57:43 2010 (r6189) +++ trunk/src/include/cpu/cpu.h Fri Dec 17 01:03:18 2010 (r6190) @@ -9,7 +9,7 @@ void initialize_cpus(struct bus *cpu_bus); void secondary_cpu_init(void); -#if CONFIG_WAIT_BEFORE_CPUS_INIT==0 +#if !defined(CONFIG_WAIT_BEFORE_CPUS_INIT) || CONFIG_WAIT_BEFORE_CPUS_INIT==0 #define cpus_ready_for_init() do {} while(0) #else void cpus_ready_for_init(void);

1 0

[commit] r6189 - trunk/src/arch/x86/include
by repository service 16 Dec '10

16 Dec '10

Author: stepan Date: Fri Dec 17 00:57:43 2010 New Revision: 6189 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6189 Log: drop unused code in div64.h Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/arch/x86/include/div64.h Modified: trunk/src/arch/x86/include/div64.h ============================================================================== --- trunk/src/arch/x86/include/div64.h Fri Dec 17 00:57:00 2010 (r6188) +++ trunk/src/arch/x86/include/div64.h Fri Dec 17 00:57:43 2010 (r6189) @@ -27,25 +27,4 @@ __mod; \ }) -/* - * (long)X = ((long long)divs) / (long)div - * (long)rem = ((long long)divs) % (long)div - * - * Warning, this will do an exception if X overflows. - */ -#define div_long_long_rem(a,b,c) div_ll_X_l_rem(a,b,c) - -extern inline long -div_ll_X_l_rem(long long divs, long div, long *rem); - -extern inline long -div_ll_X_l_rem(long long divs, long div, long *rem) -{ - long dum2; - __asm__("divl %2":"=a"(dum2), "=d"(*rem) - : "rm"(div), "A"(divs)); - - return dum2; - -} #endif

1 0

[commit] r6188 - trunk/src/arch/x86
by repository service 16 Dec '10

16 Dec '10

Author: stepan Date: Fri Dec 17 00:57:00 2010 New Revision: 6188 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6188 Log: print what make is doing (CBFS call) Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/arch/x86/Makefile.bootblock.inc Modified: trunk/src/arch/x86/Makefile.bootblock.inc ============================================================================== --- trunk/src/arch/x86/Makefile.bootblock.inc Fri Dec 17 00:52:04 2010 (r6187) +++ trunk/src/arch/x86/Makefile.bootblock.inc Fri Dec 17 00:57:00 2010 (r6188) @@ -2,6 +2,7 @@ # Build the final rom image $(obj)/coreboot.pre: $(obj)/coreboot.romstage $(obj)/coreboot.pre1 $(CBFSTOOL) + @printf " CBFS $(subst $(obj)/,,$(@))\n" rm -f $@ cp $(obj)/coreboot.pre1 $@ $(CBFSTOOL) $@ add-stage $(obj)/romstage.elf $(CONFIG_CBFS_PREFIX)/romstage x 0x$(shell cat $(obj)/location.txt)

1 0

[commit] r6187 - trunk/src/devices
by repository service 16 Dec '10

16 Dec '10

Author: stepan Date: Fri Dec 17 00:52:04 2010 New Revision: 6187 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6187 Log: don't hardcode CONFIG_PC80_SYSTEM Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/devices/pci_device.c Modified: trunk/src/devices/pci_device.c ============================================================================== --- trunk/src/devices/pci_device.c Fri Dec 17 00:37:17 2010 (r6186) +++ trunk/src/devices/pci_device.c Fri Dec 17 00:52:04 2010 (r6187) @@ -48,7 +48,6 @@ #if CONFIG_CARDBUS_PLUGIN_SUPPORT == 1 #include <device/cardbus.h> #endif -#define CONFIG_PC80_SYSTEM 1 #if CONFIG_PC80_SYSTEM == 1 #include <pc80/i8259.h> #endif @@ -1262,9 +1261,11 @@ printk(BIOS_DEBUG, " Readback = %d\n", irq); #endif +#if CONFIG_PC80_SYSTEM == 1 /* Change to level triggered. */ i8259_configure_irq_trigger(pIntAtoD[line - 1], IRQ_LEVEL_TRIGGERED); +#endif } } #endif

1 0

[commit] r6186 - in trunk/src: . arch/x86 cpu cpu/x86
by repository service 16 Dec '10

16 Dec '10

Author: stepan Date: Fri Dec 17 00:37:17 2010 New Revision: 6186 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6186 Log: - Fix shortcoming in Kconfig when handling multiple "choice"s - move some variables where they belong Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/Kconfig trunk/src/arch/x86/Kconfig trunk/src/cpu/Kconfig trunk/src/cpu/x86/Kconfig Modified: trunk/src/Kconfig ============================================================================== --- trunk/src/Kconfig Fri Dec 17 00:24:27 2010 (r6185) +++ trunk/src/Kconfig Fri Dec 17 00:37:17 2010 (r6186) @@ -101,7 +101,16 @@ endmenu source src/mainboard/Kconfig + +# This option is used to set the architecture of a mainboard to X86. +# It is usually set in mainboard/*/Kconfig. +config ARCH_X86 + bool + default n + +if ARCH_X86 source src/arch/x86/Kconfig +endif menu "Chipset" @@ -133,15 +142,6 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x0 - -config CPU_ADDR_BITS - int - default 36 - -config LOGICAL_CPUS - bool - default y - config PCI_ROM_RUN bool default n Modified: trunk/src/arch/x86/Kconfig ============================================================================== --- trunk/src/arch/x86/Kconfig Fri Dec 17 00:24:27 2010 (r6185) +++ trunk/src/arch/x86/Kconfig Fri Dec 17 00:37:17 2010 (r6186) @@ -1,9 +1,3 @@ -# This option is used to set the architecture of a mainboard to X86. -# It is usually set in mainboard/*/Kconfig. -config ARCH_X86 - bool - default n - # This is an SMP option. It relates to starting up APs. # It is usually set in mainboard/*/Kconfig. # TODO: Improve description. @@ -53,23 +47,26 @@ default n if TINY_BOOTBLOCK default y +# We had to rename the choice options under arch/ because otherwise +# the options would conflict between different architectures despite +# the if ARCH_xxx guarding the arch/xxx/Kconfig sourcing. choice prompt "Bootblock behaviour" - default BOOTBLOCK_SIMPLE + default X86_BOOTBLOCK_SIMPLE depends on TINY_BOOTBLOCK -config BOOTBLOCK_SIMPLE +config X86_BOOTBLOCK_SIMPLE bool "Always load fallback" -config BOOTBLOCK_NORMAL +config X86_BOOTBLOCK_NORMAL bool "Switch to normal if CMOS says so" endchoice config BOOTBLOCK_SOURCE string - default "bootblock_simple.c" if BOOTBLOCK_SIMPLE - default "bootblock_normal.c" if BOOTBLOCK_NORMAL + default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE + default "bootblock_normal.c" if X86_BOOTBLOCK_NORMAL config UPDATE_IMAGE bool "Update existing coreboot.rom image" @@ -85,6 +82,10 @@ bool default n +config PC80_SYSTEM + bool + default y + config BOOTBLOCK_NORTHBRIDGE_INIT string Modified: trunk/src/cpu/Kconfig ============================================================================== --- trunk/src/cpu/Kconfig Fri Dec 17 00:24:27 2010 (r6185) +++ trunk/src/cpu/Kconfig Fri Dec 17 00:37:17 2010 (r6186) @@ -1,3 +1,5 @@ +if ARCH_X86 + source src/cpu/amd/Kconfig source src/cpu/intel/Kconfig source src/cpu/via/Kconfig @@ -57,3 +59,5 @@ help Unset this if you don't want the MTRR code to use subtractive MTRRs + +endif # ARCH_X86 Modified: trunk/src/cpu/x86/Kconfig ============================================================================== --- trunk/src/cpu/x86/Kconfig Fri Dec 17 00:24:27 2010 (r6185) +++ trunk/src/cpu/x86/Kconfig Fri Dec 17 00:37:17 2010 (r6186) @@ -30,3 +30,13 @@ config XIP_ROM_SIZE hex default 0x10000 + +config CPU_ADDR_BITS + int + default 36 + +config LOGICAL_CPUS + bool + default y + +

1 0

[commit] r6185 - trunk/src/northbridge/intel/i945
by repository service 16 Dec '10

16 Dec '10

Author: stepan Date: Fri Dec 17 00:24:27 2010 New Revision: 6185 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6185 Log: fix according to coding guidelines Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/northbridge/intel/i945/raminit.c Modified: trunk/src/northbridge/intel/i945/raminit.c ============================================================================== --- trunk/src/northbridge/intel/i945/raminit.c Thu Dec 16 20:57:54 2010 (r6184) +++ trunk/src/northbridge/intel/i945/raminit.c Fri Dec 17 00:24:27 2010 (r6185) @@ -28,7 +28,8 @@ #include "i945.h" #include <cbmem.h> -struct cbmem_entry *get_cbmem_toc(void) { +struct cbmem_entry *get_cbmem_toc(void) +{ return (struct cbmem_entry *)(get_top_of_ram() - HIGH_MEMORY_SIZE); }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot December 2010