Set the mainboard/amd directory up to support more than one.

remove Config variables now defined elsewhere.
add rumba Kconfig and Makefile.inc

rumba won't build until my earlier patches are acked.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4617 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/amd/Kconfig b/src/mainboard/amd/Kconfig
index f16f5e1dca16c1298b282de8ab6593bdc2e1b668..9cca28453303c46671747e848c5948af83a63aff 100644 (file)
--- a/src/mainboard/amd/Kconfig
+++ b/src/mainboard/amd/Kconfig
@@ -1 +1,9 @@
-source "src/mainboard/amd/serengeti_cheetah/Kconfig"
\ No newline at end of file
+choice
+       prompt "Mainboard model"
+       depends on VENDOR_AMD
+
+source "src/mainboard/amd/serengeti_cheetah/Kconfig"
+source "src/mainboard/amd/rumba/Kconfig"
+
+endchoice
+

diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
new file mode 100644 (file)
index 0000000..82d4667
--- /dev/null
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -0,0 +1,62 @@
+
+
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+config BOARD_AMD_RUMBA
+       bool "Rumba"
+       select ARCH_X86
+       select CPU_AMD_GX2
+       select NORTHBRIDGE_AMD_GX2
+       select SOUTHBRIDGE_AMD_CS5536
+       select UDELAY_TSC
+       select HAVE_PIRQ_TABLE
+       help
+         AMD Rumba mainboard.
+
+config MAINBOARD_DIR
+       string
+       default amd/rumba
+       depends on BOARD_AMD_RUMBA
+
+config MAINBOARD_PART_NUMBER
+       string
+       default "Rumba"
+       depends on BOARD_AMD_RUMBA
+
+config HAVE_OPTION_TABLE
+       bool
+       default n
+       depends on BOARD_AMD_RUMBA
+
+config IRQ_SLOT_COUNT
+       int
+       default 2
+       depends on BOARD_AMD_RUMBA
+
+config USE_INIT
+       int
+       default 0
+       depends on BOARD_AMD_RUMBA
+
+
+config TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
+       int
+       default 0
+       depends on BOARD_AMD_RUMBA

diff --git a/src/mainboard/amd/rumba/Makefile.inc b/src/mainboard/amd/rumba/Makefile.inc
new file mode 100644 (file)
index 0000000..6941719
--- /dev/null
+++ b/src/mainboard/amd/rumba/Makefile.inc
@@ -0,0 +1 @@
+include $(src)/mainboard/Makefile.romccboard.inc

diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index 3be6605a145f37a8a1b6a4149d7847e85524d0fd..f13f727c5f6e428e16a0b0f9bd0fbc5e4119f5f0 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -1,7 +1,3 @@
-choice
-       prompt "Mainboard model"
-       depends on VENDOR_AMD
-
 config BOARD_AMD_SERENGETI_CHEETAH
        bool "Serengeti Cheetah"
        select ARCH_X86
@@ -17,7 +13,6 @@ config BOARD_AMD_SERENGETI_CHEETAH
        select USE_DCACHE_RAM
        help
         AMD Serengeti Cheetah mainboard.
-endchoice
 
 config MAINBOARD_DIR
        string
@@ -74,10 +69,6 @@ config MAINBOARD_PART_NUMBER
        default "Serengeti-Cheetah"
        depends on BOARD_AMD_SERENGETI_CHEETAH
 
-config PCI_64BIT_PREF_MEM
-       int
-       default 0
-       depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config USE_FAILOVER_IMAGE
        int