From e7f5709e148c165b38cc832b71e13804c03a90bc Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Sat, 29 Aug 2009 02:47:57 +0000 Subject: [PATCH] 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 Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4617 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/amd/Kconfig | 10 +++- src/mainboard/amd/rumba/Kconfig | 62 +++++++++++++++++++++ src/mainboard/amd/rumba/Makefile.inc | 1 + src/mainboard/amd/serengeti_cheetah/Kconfig | 9 --- 4 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 src/mainboard/amd/rumba/Kconfig create mode 100644 src/mainboard/amd/rumba/Makefile.inc diff --git a/src/mainboard/amd/Kconfig b/src/mainboard/amd/Kconfig index f16f5e1dca..9cca284533 100644 --- 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 index 0000000000..82d466746b --- /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 +## +## 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 index 0000000000..6941719a6f --- /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 3be6605a14..f13f727c5f 100644 --- 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