summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-08-25 00:53:22 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-08-25 00:53:22 +0000
commit5ec2c2b998086415047c05aca4ca7082de329e5a (patch)
tree7f8d974532c3a75ce4dfa202360359a2944a5e7e /src/cpu
parent50d0b8ce17dada0f5097ebaaf8de9fcbb9986389 (diff)
Various Kconfig and Makefile.inc fixes and cosmetics.
- Whitespace fixes, remove trailing whitespace, use TABs for identation (except in Kconfig "help" lines, which start with one TAB and two spaces as per Linux kernel style) - Kconfig: Standardize on 'bool' (not 'boolean'). - s/lar/cbfs/ in one Kconfig help string. - Reword various Kconfig menu entries for a more usable and consistent menu. - Fix incorrect comment of NO_RUN in devices/Kconfig. - superio/serverengines/Kconfig: Incorrect config name. - superio/Makefile.inc: s/serverengine/serverengines/. - superio/intel/Kconfig: s/SUPERIO_FINTEK_I3100/SUPERIO_INTEL_I3100/. - mainboard/via/vt8454c/Kconfig: Fix copy-paste error in help string. - mainboard/via/epia-n/Kconfig: Fix "bool" menu text. - console/Kconfig: Don't mention defaults in the menu string, kconfig already displays them anyway. - Kill "Drivers" menu for now, it only confuses users as long as it's emtpy. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4567 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/Makefile.inc1
-rw-r--r--src/cpu/amd/dualcore/Makefile.inc3
-rw-r--r--src/cpu/amd/model_fxx/Kconfig1
-rw-r--r--src/cpu/amd/socket_AM2/Kconfig4
-rw-r--r--src/cpu/amd/socket_F/Kconfig6
-rw-r--r--src/cpu/emulation/qemu-x86/Kconfig4
-rw-r--r--src/cpu/intel/Makefile.inc7
-rw-r--r--src/cpu/intel/socket_PGA370/Makefile.inc1
-rw-r--r--src/cpu/x86/smm/Makefile.inc4
-rw-r--r--src/cpu/x86/tsc/Makefile.inc6
10 files changed, 17 insertions, 20 deletions
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index e650525b61..60be3edf51 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -4,5 +4,4 @@ subdirs-y += via
subdirs-y += emulation
#input ppc
#input simple_init
-#input via
#input x86
diff --git a/src/cpu/amd/dualcore/Makefile.inc b/src/cpu/amd/dualcore/Makefile.inc
index 90a7ee55ef..ee2d93c928 100644
--- a/src/cpu/amd/dualcore/Makefile.inc
+++ b/src/cpu/amd/dualcore/Makefile.inc
@@ -1,3 +1,2 @@
-# This is a leaf makefile, no conditionals. If it is included it will
-# be used.
+# This is a leaf Makefile, no conditionals. If it is included it will be used.
obj-y += amd_sibling.o
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index bab2175fee..1037725a97 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -13,4 +13,3 @@ config CPU_ADDR_BITS
default 40
depends on CPU_AMD_SOCKET_F
-
diff --git a/src/cpu/amd/socket_AM2/Kconfig b/src/cpu/amd/socket_AM2/Kconfig
index d3afbab3a4..6b61131fa2 100644
--- a/src/cpu/amd/socket_AM2/Kconfig
+++ b/src/cpu/amd/socket_AM2/Kconfig
@@ -12,13 +12,13 @@ config K8_REV_F_SUPPORT
default 1
depends on CPU_AMD_SOCKET_AM2
-#Opteron K8 1G HT Support
+# Opteron K8 1G HT support
config K8_HT_FREQ_1G_SUPPORT
hex
default 1
depends on CPU_AMD_SOCKET_AM2
-#DDR2 and REG
+# DDR2 and REG
config DIMM_SUPPORT
hex
default 0x0004
diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig
index 30e90807b6..f9e03359e0 100644
--- a/src/cpu/amd/socket_F/Kconfig
+++ b/src/cpu/amd/socket_F/Kconfig
@@ -12,16 +12,16 @@ config K8_REV_F_SUPPORT
default 1
depends on CPU_AMD_SOCKET_F
-#Opteron K8 1G HT Support
+# Opteron K8 1G HT support
config K8_HT_FREQ_1G_SUPPORT
hex
default 1
depends on CPU_AMD_SOCKET_F
-#DDR2 and REG
+# DDR2 and REG
config DIMM_SUPPORT
hex
- default 0x0104
+ default 0x0104
depends on CPU_AMD_SOCKET_F
config CPU_SOCKET_TYPE
diff --git a/src/cpu/emulation/qemu-x86/Kconfig b/src/cpu/emulation/qemu-x86/Kconfig
index 15b3538f25..842fbfd3b4 100644
--- a/src/cpu/emulation/qemu-x86/Kconfig
+++ b/src/cpu/emulation/qemu-x86/Kconfig
@@ -1,4 +1,4 @@
config CPU_EMULATION_QEMU_X86
- bool
- default false
+ bool
+ default false
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index d986c6350d..3a5f3a03ce 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -1,6 +1,7 @@
-# Note: from here on down, we are socket-centric. Socket choice determines what other cpu files are included.
-# Therefore:
-# ONLY include Makefile.inc from socket directories!
+# Note: From here on down, we are socket-centric. Socket choice determines
+# what other cpu files are included.
+#
+# Therefore: ONLY include Makefile.inc from socket directories!
subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCPGA478) += socket_mFCPGA478
subdirs-$(CONFIG_CPU_INTEL_SOCKET_PGA370) += socket_PGA370
diff --git a/src/cpu/intel/socket_PGA370/Makefile.inc b/src/cpu/intel/socket_PGA370/Makefile.inc
index b56585e889..8b49ded5f5 100644
--- a/src/cpu/intel/socket_PGA370/Makefile.inc
+++ b/src/cpu/intel/socket_PGA370/Makefile.inc
@@ -30,4 +30,3 @@ subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
subdirs-y += ../microcode
-
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc
index 6a566017ea..b91e96c332 100644
--- a/src/cpu/x86/smm/Makefile.inc
+++ b/src/cpu/x86/smm/Makefile.inc
@@ -25,12 +25,12 @@
## smmobject smihandler.o
##
## makerule smm.o
-## depends "$(SMM-OBJECTS) $(TOP)/src/console/printk.o $(TOP)/src/console/vtxprintf.o $(LIBGCC_FILE_NAME)"
+## depends "$(SMM-OBJECTS) $(TOP)/src/console/printk.o $(TOP)/src/console/vtxprintf.o $(LIBGCC_FILE_NAME)"
## action "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ $^"
## end
##
## makerule smm
-## depends "smm.o $(TOP)/src/cpu/x86/smm/smm.ld ldoptions"
+## depends "smm.o $(TOP)/src/cpu/x86/smm/smm.ld ldoptions"
## action "$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o smm.elf -T $(TOP)/src/cpu/x86/smm/smm.ld smm.o"
## action "$(CONFIG_CROSS_COMPILE)nm -n smm.elf | sort > smm.map"
## action "$(OBJCOPY) -O binary smm.elf smm"
diff --git a/src/cpu/x86/tsc/Makefile.inc b/src/cpu/x86/tsc/Makefile.inc
index 93bd13720e..408105ef96 100644
--- a/src/cpu/x86/tsc/Makefile.inc
+++ b/src/cpu/x86/tsc/Makefile.inc
@@ -1,7 +1,7 @@
obj-y += delay_tsc.o
# default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=0
-# if CONFIG_UDELAY_TSC
-# default CONFIG_HAVE_INIT_TIMER=1
-# object delay_tsc.o
+# if CONFIG_UDELAY_TSC
+# default CONFIG_HAVE_INIT_TIMER=1
+# object delay_tsc.o
# end