Trivial:

 add missed CIMx file to romstage. in order to link them into romstage, move all CIMx table to .rodata section.
 Run dos2unix on Makefile.inc, which is not upstream CIMx code

Signed-off-by: Kerry She <kerry.she@amd.com>
Acked-by: Kerry She <kerry.she@amd.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6239 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 86 insertions, 75 deletions

diff --git a/src/vendorcode/amd/cimx/sb800/Makefile.inc b/src/vendorcode/amd/cimx/sb800/Makefile.inc
index f6dcfc926b..9dab1b0280 100644
--- a/src/vendorcode/amd/cimx/sb800/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb800/Makefile.inc
@@ -1,75 +1,86 @@
-#

-# This file is part of the coreboot project.

-#

-# Copyright (C) 2010 Advanced Micro Devices, Inc.

-#

-# 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

-#

-

-# CIMX Root directory

-CIMX_ROOT = src/vendorcode/amd/cimx

-

-CIMX_INC  = -I$(src)/mainboard/$(MAINBOARDDIR)

-CIMX_INC  += -I$(src)/southbridge/amd/cimx_wrapper/sb800

-CIMX_INC  += -I$(CIMX_ROOT)/sb800

-#TODO merge withagesa lib functions

-CIMX_INC  += -I$(CIMX_ROOT)/lib

-

-# CIMX LIB files

-romstage-y += MEMLIB.c

-romstage-y += PCILIB.c

-romstage-y += IOLIB.c

-romstage-y += PMIOLIB.c

-romstage-y += AMDLIB.c

-romstage-y += SBPELIB.c

-romstage-y += AMDSBLIB.c

-romstage-y += SBPOR.c

-romstage-y += ECLIB.c

-romstage-y += EC.c

-ramstage-y += DISPATCHER.c

-

-ramstage-y += ACPILIB.c

-ramstage-y += AZALIA.c

-ramstage-y += DISPATCHER.c

-ramstage-y += ECfanc.c

-ramstage-y += ECfanLIB.c

-ramstage-y += GEC.c

-ramstage-y += Gpp.c

-ramstage-y += PMIO2LIB.c

-ramstage-y += SATA.c

-ramstage-y += SBCMN.c

-ramstage-y += SBMAIN.c

-ramstage-y += SBPOR.c

-ramstage-y += MEMLIB.c

-ramstage-y += PCILIB.c

-ramstage-y += IOLIB.c

-ramstage-y += PMIOLIB.c

-ramstage-y += AMDLIB.c

-ramstage-y += SBPELIB.c

-ramstage-y += AMDSBLIB.c

-ramstage-y += ECLIB.c

-ramstage-y += EC.c

-ramstage-y += SMM.c

-ramstage-y += USB.c

-#ramstage-y += LEGACY.c

-#ramstage-y += SbModInf.c

-

-CIMX_CFLAGS =

-export CIMX_ROOT

-export CIMX_INC

-export CIMX_CFLAGS

-CC := $(CC) $(CIMX_INC)

-

-#######################################################################

-

+#
+# This file is part of the coreboot project.
+#
+# Copyright (C) 2010 Advanced Micro Devices, Inc.
+#
+# 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
+#
+
+# CIMX Root directory
+CIMX_ROOT = src/vendorcode/amd/cimx
+
+CIMX_INC  = -I$(src)/mainboard/$(MAINBOARDDIR)
+CIMX_INC  += -I$(src)/southbridge/amd/cimx_wrapper/sb800
+CIMX_INC  += -I$(CIMX_ROOT)/sb800
+#TODO merge with agesa lib functions
+CIMX_INC  += -I$(CIMX_ROOT)/lib
+
+romstage-y += ACPILIB.c
+romstage-y += AZALIA.c
+romstage-y += DISPATCHER.c
+romstage-y += ECfanc.c
+romstage-y += ECfanLIB.c
+romstage-y += GEC.c
+romstage-y += Gpp.c
+romstage-y += PMIO2LIB.c
+romstage-y += SATA.c
+romstage-y += SBCMN.c
+romstage-y += SBMAIN.c
+romstage-y += SBPOR.c
+romstage-y += MEMLIB.c
+romstage-y += PCILIB.c
+romstage-y += IOLIB.c
+romstage-y += PMIOLIB.c
+romstage-y += AMDLIB.c
+romstage-y += SBPELIB.c
+romstage-y += AMDSBLIB.c
+romstage-y += ECLIB.c
+romstage-y += EC.c
+romstage-y += SMM.c
+romstage-y += USB.c
+
+ramstage-y += ACPILIB.c
+ramstage-y += AZALIA.c
+ramstage-y += DISPATCHER.c
+ramstage-y += ECfanc.c
+ramstage-y += ECfanLIB.c
+ramstage-y += GEC.c
+ramstage-y += Gpp.c
+ramstage-y += PMIO2LIB.c
+ramstage-y += SATA.c
+ramstage-y += SBCMN.c
+ramstage-y += SBMAIN.c
+ramstage-y += SBPOR.c
+ramstage-y += MEMLIB.c
+ramstage-y += PCILIB.c
+ramstage-y += IOLIB.c
+ramstage-y += PMIOLIB.c
+ramstage-y += AMDLIB.c
+ramstage-y += SBPELIB.c
+ramstage-y += AMDSBLIB.c
+ramstage-y += ECLIB.c
+ramstage-y += EC.c
+ramstage-y += SMM.c
+ramstage-y += USB.c
+#ramstage-y += LEGACY.c
+#ramstage-y += SbModInf.c
+
+CIMX_CFLAGS =
+export CIMX_ROOT
+export CIMX_INC
+export CIMX_CFLAGS
+CC := $(CC) $(CIMX_INC)
+
+#######################################################################
+