Author: stepan Date: Thu Feb 4 02:32:43 2010 New Revision: 5082 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5082
Log: Move CAR settings for all GX1, GX2, LX and Intel Slot2 boards to the CPU. This automatically adds the settings for those boards that didn't have settings at all yet. Also, small fixup to compareboard.
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
--> Please help porting all boards from newconfig to Kconfig <--
This is a lot of janitor work and we can use your helping hands. The sooner we can get rid of Kbuild, the better. The KBuild report on the mailing list shows the config differences between newconfig and Kconfig. In theory, all Kconfig configs should be equal to their newconfig pendant. In practice it's better to come close but stay clean.
--> Please help porting all boards from newconfig to Kconfig <--
Modified: trunk/src/cpu/amd/model_gx1/Kconfig trunk/src/cpu/amd/model_gx2/Kconfig trunk/src/cpu/amd/model_lx/Kconfig trunk/src/cpu/intel/slot_2/Kconfig trunk/src/mainboard/amd/db800/Kconfig trunk/src/mainboard/amd/norwich/Kconfig trunk/src/mainboard/artecgroup/dbe61/Kconfig trunk/src/mainboard/digitallogic/msm800sev/Kconfig trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig trunk/src/mainboard/lippert/roadrunner-lx/Kconfig trunk/src/mainboard/lippert/spacerunner-lx/Kconfig trunk/src/mainboard/pcengines/alix1c/Kconfig trunk/util/compareboard/compareboard
Modified: trunk/src/cpu/amd/model_gx1/Kconfig ============================================================================== --- trunk/src/cpu/amd/model_gx1/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/cpu/amd/model_gx1/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -21,3 +21,13 @@ config CPU_AMD_GX1 bool
+config DCACHE_RAM_BASE + hex + default 0xc0000 + depends on CPU_AMD_GX1 + +config DCACHE_RAM_SIZE + hex + default 0x01000 + depends on CPU_AMD_GX1 +
Modified: trunk/src/cpu/amd/model_gx2/Kconfig ============================================================================== --- trunk/src/cpu/amd/model_gx2/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/cpu/amd/model_gx2/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -1,2 +1,32 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 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 +## + config CPU_AMD_GX2 bool + +config DCACHE_RAM_BASE + hex + default 0xc0000 + depends on CPU_AMD_GX2 + +config DCACHE_RAM_SIZE + hex + default 0x01000 + depends on CPU_AMD_GX2 +
Modified: trunk/src/cpu/amd/model_lx/Kconfig ============================================================================== --- trunk/src/cpu/amd/model_lx/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/cpu/amd/model_lx/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -1,3 +1,13 @@ config CPU_AMD_LX bool
+config DCACHE_RAM_BASE + hex + default 0xc8000 + depends on CPU_AMD_LX + +config DCACHE_RAM_SIZE + hex + default 0x8000 + depends on CPU_AMD_LX +
Modified: trunk/src/cpu/intel/slot_2/Kconfig ============================================================================== --- trunk/src/cpu/intel/slot_2/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/cpu/intel/slot_2/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -21,3 +21,13 @@ config CPU_INTEL_SLOT_2 bool
+config DCACHE_RAM_BASE + hex + default 0xc0000 + depends on CPU_INTEL_SLOT_2 + +config DCACHE_RAM_SIZE + hex + default 0x01000 + depends on CPU_INTEL_SLOT2 +
Modified: trunk/src/mainboard/amd/db800/Kconfig ============================================================================== --- trunk/src/mainboard/amd/db800/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/amd/db800/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -32,16 +32,6 @@ default 4 depends on BOARD_AMD_DB800
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_AMD_DB800 - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_AMD_DB800 - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/amd/norwich/Kconfig ============================================================================== --- trunk/src/mainboard/amd/norwich/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/amd/norwich/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -31,16 +31,6 @@ default 6 depends on BOARD_AMD_NORWICH
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_AMD_NORWICH - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_AMD_NORWICH - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/artecgroup/dbe61/Kconfig ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/artecgroup/dbe61/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -31,16 +31,6 @@ default 3 depends on BOARD_ARTECGROUP_DBE61
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_ARTECGROUP_DBE61 - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_ARTECGROUP_DBE61 - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/digitallogic/msm800sev/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/digitallogic/msm800sev/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -32,16 +32,6 @@ default 9 depends on BOARD_DIGITALLOGIC_MSM800SEV
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_DIGITALLOGIC_MSM800SEV - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_DIGITALLOGIC_MSM800SEV - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -31,16 +31,6 @@ default 9 depends on BOARD_IEI_PCISA_LX_800_R10
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_IEI_PCISA_LX_800_R10 - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_IEI_PCISA_LX_800_R10 - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/lippert/roadrunner-lx/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/lippert/roadrunner-lx/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -32,16 +32,6 @@ default 7 depends on BOARD_LIPPERT_ROADRUNNER_LX
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_LIPPERT_ROADRUNNER_LX - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_LIPPERT_ROADRUNNER_LX - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/lippert/spacerunner-lx/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/lippert/spacerunner-lx/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -32,16 +32,6 @@ default 7 depends on BOARD_LIPPERT_SPACERUNNER_LX
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_LIPPERT_SPACERUNNER_LX - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_LIPPERT_SPACERUNNER_LX - config RAMBASE hex default 0x4000
Modified: trunk/src/mainboard/pcengines/alix1c/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/Kconfig Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/src/mainboard/pcengines/alix1c/Kconfig Thu Feb 4 02:32:43 2010 (r5082) @@ -32,16 +32,6 @@ default 5 depends on BOARD_PCENGINES_ALIX1C
-config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on BOARD_PCENGINES_ALIX1C - -config DCACHE_RAM_SIZE - hex - default 0x8000 - depends on BOARD_PCENGINES_ALIX1C - config RAMBASE hex default 0x4000
Modified: trunk/util/compareboard/compareboard ============================================================================== --- trunk/util/compareboard/compareboard Thu Feb 4 01:55:06 2010 (r5081) +++ trunk/util/compareboard/compareboard Thu Feb 4 02:32:43 2010 (r5082) @@ -56,6 +56,8 @@
sed \ -e "/^CONFIG_CONSOLE_/ d" \ + -e "/^CONFIG_MAXIMUM_CONSOLE_LOGLEVEL/ d" \ + -e "/^CONFIG_DEFAULT_CONSOLE_LOGLEVEL/ d" \ -e "/^CONFIG_RESET_/ d" \ -e "/^CONFIG_XIP_ROM_/ d" \ -e "/^CONFIG_PRECOMPRESSED_PAYLOAD / d" \ @@ -77,7 +79,6 @@ -e "/^CONFIG_STACK_SIZE / d" \ -e "/^CONFIG_GDB_STUB / d" \ -e "/^CONFIG_VIDEO_MB / d" \ - -e "/^CONFIG_IOAPIC / d" \ -e "/^CONFIG_HAVE_MOVNTI / d" \ -e "/^CONFIG_PCIE_CONFIGSPACE_HOLE / d" \ $A/old > $A/old.filtered