Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1500
-gerrit
commit c12c8f608dcbc9285b50d3fe8d81bd34737dc33c
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Sep 11 12:10:09 2012 +0800
nvramtool: Set build flags for FreeBSD
Set HOSTCFLAGS as nil to make the nvramtool include the regex.h
in system. Otherwise it will include the regex.h in kconfig, which
will cause building error in FreeBSD.
Change-Id: I95292e23e1716da1260842be9597119a4e26c8ed
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
util/nvramtool/Makefile.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index 0acda04..080734c 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -27,6 +27,10 @@ endif
ifeq ($(OS_ARCH), NetBSD)
NVRAMTOOLLDLFLAGS = -l$(shell uname -p)
endif
+ifeq ($(OS_ARCH), FreeBSD)
+NVRAMTOOLFLAGS += -O2 -g -Wall -W
+HOSTCFLAGS =
+endif
ifeq ($(shell uname -o), Cygwin)
NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__
NVRAMTOOLLDFLAGS = -lioperm
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1502
-gerrit
commit f623c2339d698b613ad2c52a2f90319c0a3fe7ce
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Sep 11 17:47:29 2012 +0800
crossgcc: Allow the non-gnu tar and patch work on FreeBSD
This patch and 2 previous ones,
http://review.coreboot.org/1500http://review.coreboot.org/1501
can make the coreboot built on FreeBSD stable-8.3.
Change-Id: I0a9d0bb0e535aa5e0dde146db330c3c8d7b4d8cb
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
util/crossgcc/buildgcc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 415b408..028d3c9 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -99,6 +99,13 @@ searchgnu()
fi
fi
done
+ # A workaround for FreeBSD, whose nongnu patch and tar also work.
+ if [ `uname` = "FreeBSD" -a $1 != make ]; then
+ if test -x "`which $1 2>/dev/null`"; then
+ echo $1
+ return
+ fi
+ fi
printf "${RED}ERROR:${red} Missing toolchain: $1${NC}\n" >&2
exit 1
}
the following patch was just integrated into master:
commit 1de5f9391147b465bb2d40f9e62466d76b3dc036
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Sep 11 12:13:39 2012 +0800
nvramtool: Remove the building warning on older gcc
Some older gcc requires the default entry in switch, otherwise
build warning "enumeration value not handled in switch" will come
up.
Change-Id: Ic8ea9960e4aca599e0ea62ec345122c9df57e766
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
Reviewed-By: Patrick Georgi <patrick(a)georgi-clan.de> at Tue Sep 11 08:32:30 2012, giving +2
See http://review.coreboot.org/1501 for details.
-gerrit
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1501
-gerrit
commit 1de5f9391147b465bb2d40f9e62466d76b3dc036
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Sep 11 12:13:39 2012 +0800
nvramtool: Remove the building warning on older gcc
Some older gcc requires the default entry in switch, otherwise
build warning "enumeration value not handled in switch" will come
up.
Change-Id: Ic8ea9960e4aca599e0ea62ec345122c9df57e766
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
util/nvramtool/cmos_lowlevel.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 55b1879..ef0c383 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -55,6 +55,7 @@ void select_hal(hal_t hal, void *data)
break;
#endif
case HAL_MEMORY:
+ default:
current_access = &memory_hal;
break;
}
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1500
-gerrit
commit 0640788d8cc1faf46a8055424ff8d8720e9112be
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Sep 11 12:10:09 2012 +0800
nvramtool: Set build flags for FreeBSD
Set HOSTCFLAGS as nil to make the nvramtool include the regex.h
in system. Otherwise it will include the regex.h in kconfig, which
will cause building error in FreeBSD.
Change-Id: I95292e23e1716da1260842be9597119a4e26c8ed
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
util/nvramtool/Makefile.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index 0acda04..080734c 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -27,6 +27,10 @@ endif
ifeq ($(OS_ARCH), NetBSD)
NVRAMTOOLLDLFLAGS = -l$(shell uname -p)
endif
+ifeq ($(OS_ARCH), FreeBSD)
+NVRAMTOOLFLAGS += -O2 -g -Wall -W
+HOSTCFLAGS =
+endif
ifeq ($(shell uname -o), Cygwin)
NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__
NVRAMTOOLLDFLAGS = -lioperm
Siyuan Wang (wangsiyuanbuaa(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1497
-gerrit
commit 6a21b73be66084db0cd3364678b9a4e9a3505d43
Author: Siyuan Wang <wangsiyuanbuaa(a)gmail.com>
Date: Fri Sep 7 18:35:17 2012 +0800
C32 legacy code: change CONFIG_CPU_AMD_SOCKET_C32 to CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA
Currently the C32 has some legacy boards which use the old C32 code. We need to seperate them.
CONFIG_CPU_AMD_SOCKET_C32 was used in legacy code before.
But it is not a good idea, so we change the code as follows:
So we use CONFIG_CPU_AMD_SOCKET_C32 to identify mainboard which uses agesa code,
and use CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA to identify mainboard which uses legacy code.
Change-Id: If6114bf8912e78b7732f25a1adfb2e4d8eb10ee4
Signed-off-by: Siyuan Wang <SiYuan.Wang(a)amd.com>
Signed-off-by: Siyuan Wang <wangsiyuanbuaa(a)gmail.com>
---
src/cpu/amd/Makefile.inc | 2 +-
src/cpu/amd/socket_C32/Kconfig | 14 +++++++-------
src/mainboard/supermicro/h8scm_fam10/Kconfig | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index 6663d14..85ce7f6 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -7,7 +7,7 @@ subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2) += socket_AM2
subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2R2) += socket_AM2r2
subdirs-$(CONFIG_CPU_AMD_SOCKET_AM3) += socket_AM3
subdirs-$(CONFIG_CPU_AMD_SOCKET_ASB2) += socket_ASB2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_C32) += socket_C32
+subdirs-$(CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA) += socket_C32
subdirs-$(CONFIG_CPU_AMD_GEODE_GX1) += geode_gx1
subdirs-$(CONFIG_CPU_AMD_GEODE_GX2) += geode_gx2
subdirs-$(CONFIG_CPU_AMD_GEODE_LX) += geode_lx
diff --git a/src/cpu/amd/socket_C32/Kconfig b/src/cpu/amd/socket_C32/Kconfig
index 56324dc..db4b624 100644
--- a/src/cpu/amd/socket_C32/Kconfig
+++ b/src/cpu/amd/socket_C32/Kconfig
@@ -1,4 +1,4 @@
-config CPU_AMD_SOCKET_C32
+config CPU_AMD_SOCKET_C32_NON_AGESA
bool
select CPU_AMD_MODEL_10XXX
select HT3_SUPPORT
@@ -8,30 +8,30 @@ config CPU_AMD_SOCKET_C32
config CPU_SOCKET_TYPE
hex
default 0x14
- depends on CPU_AMD_SOCKET_C32
+ depends on CPU_AMD_SOCKET_C32_NON_AGESA
config EXT_RT_TBL_SUPPORT
bool
default n
- depends on CPU_AMD_SOCKET_C32
+ depends on CPU_AMD_SOCKET_C32_NON_AGESA
config EXT_CONF_SUPPORT
bool
default n
- depends on CPU_AMD_SOCKET_C32
+ depends on CPU_AMD_SOCKET_C32_NON_AGESA
config CBB
hex
default 0x0
- depends on CPU_AMD_SOCKET_C32
+ depends on CPU_AMD_SOCKET_C32_NON_AGESA
config CDB
hex
default 0x18
- depends on CPU_AMD_SOCKET_C32
+ depends on CPU_AMD_SOCKET_C32_NON_AGESA
config XIP_ROM_SIZE
hex
default 0x80000
- depends on CPU_AMD_SOCKET_C32
+ depends on CPU_AMD_SOCKET_C32_NON_AGESA
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 844763e..44f2d43 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_H8SCM_FAM10
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select ARCH_X86
- select CPU_AMD_SOCKET_C32
+ select CPU_AMD_SOCKET_C32_NON_AGESA
select DIMM_DDR3
select DIMM_REGISTERED
select NORTHBRIDGE_AMD_AMDFAM10
Siyuan Wang (wangsiyuanbuaa(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1499
-gerrit
commit 08632f969856f76a573215028bba187deb5ec0b8
Author: Siyuan Wang <wangsiyuanbuaa(a)gmail.com>
Date: Fri Sep 7 19:16:58 2012 +0800
cimx sb700: change Platform.h to remove some warnings
TRACE has redefined warnings in src/southbridge/amd/cimx/sb700/Platform.h,
so we do some changes to remove such warnings.
Change-Id: I24979e08b83434f91a8fa37cd9f16303fa0b298d
Signed-off-by: Siyuan Wang <SiYuan.Wang(a)amd.com>
Signed-off-by: Siyuan Wang <wangsiyuanbuaa(a)gmail.com>
---
src/southbridge/amd/cimx/sb700/Platform.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/southbridge/amd/cimx/sb700/Platform.h b/src/southbridge/amd/cimx/sb700/Platform.h
index d70345d..d731edf 100644
--- a/src/southbridge/amd/cimx/sb700/Platform.h
+++ b/src/southbridge/amd/cimx/sb700/Platform.h
@@ -60,6 +60,9 @@ void TraceCode ( UINT32 Level, UINT32 Code);
#define TRACECODE(Arguments)
#endif
#else
+ #ifdef TRACE
+ #undef TRACE
+ #endif
#if CONFIG_REDIRECT_SBCIMX_TRACE_TO_SERIAL
#define TRACE(Arguments) printk Arguments
#else
the following patch was just integrated into master:
commit fbc9bc1318c6ee554f0827fadd148d779173b59d
Author: Siyuan Wang <wangsiyuanbuaa(a)gmail.com>
Date: Fri Sep 7 19:18:16 2012 +0800
superio winbond w83627dhg: add a function which is used on tyan s8226
this function is used on serial output of tyan s8226
Change-Id: I5f7fa535b922b224e381886f1bea64623fa549ef
Signed-off-by: Siyuan Wang <SiYuan.Wang(a)amd.com>
Signed-off-by: Siyuan Wang <wangsiyuanbuaa(a)gmail.com>
Build-Tested: build bot (Jenkins) at Fri Sep 7 12:42:10 2012, giving +1
Reviewed-By: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> at Fri Sep 7 20:04:01 2012, giving +2
See http://review.coreboot.org/1494 for details.
-gerrit