diff options
author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-05-26 14:03:51 +0000 |
---|---|---|
committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-05-26 14:03:51 +0000 |
commit | a84a99b9948fa431bbcadf39f5216b04b3eb1d52 (patch) | |
tree | e2a3bfcd7b9b715029cd71d439288ddd638da913 /src | |
parent | d1185bfd358fa3d72d94255961926162eff9f609 (diff) | |
download | coreboot-a84a99b9948fa431bbcadf39f5216b04b3eb1d52.tar.xz |
Various fixes to the tree to get coreboot-v2 to build on Solaris
- Replace $(PWD) with $(CURDIR) in Makefiles. I don't know why
the Solaris version behaves differently, but CURDIR is a safe
choice on gnu make (and we require gnu make already)
- Use tail -1 instead of tail -n1 in a file that already relies on
tail -1 support in another place
- Use tail -1 as alternative to tail -n1 in another place
- Use #define for ulong_t in romcc, as that name is used on Solaris
- Avoid fprinting a null pointer. The standard doesn't mandate that
this is a special case, and Solaris doesn't implement it that way.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4305 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r-- | src/config/Options.lb | 2 | ||||
-rw-r--r-- | src/mainboard/amd/dbm690t/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/amd/pistachio/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/amd/serengeti_cheetah/Config.lb | 8 | ||||
-rw-r--r-- | src/mainboard/amd/serengeti_cheetah_fam10/Config.lb | 10 | ||||
-rw-r--r-- | src/mainboard/asus/a8v-e_se/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/asus/m2v-mx_se/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8_htx/Config.lb | 10 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/technexion/tim8690/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/tyan/s2891/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/tyan/s2892/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/tyan/s2895/Config.lb | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/Config.lb | 12 |
14 files changed, 30 insertions, 30 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb index a27b15ed8c..f28563a274 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -143,7 +143,7 @@ define COREBOOT_COMPILE_DOMAIN comment "Build domain name" end define COREBOOT_COMPILER - default "$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -n 1)" + default "$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -1)" export always format "\"%s\"" comment "Build compiler" diff --git a/src/mainboard/amd/dbm690t/Config.lb b/src/mainboard/amd/dbm690t/Config.lb index 1742bad686..b2815c8867 100644 --- a/src/mainboard/amd/dbm690t/Config.lb +++ b/src/mainboard/amd/dbm690t/Config.lb @@ -42,7 +42,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/acpi/*.asl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/amd/pistachio/Config.lb b/src/mainboard/amd/pistachio/Config.lb index dcd8a9b661..68fdb43a0d 100644 --- a/src/mainboard/amd/pistachio/Config.lb +++ b/src/mainboard/amd/pistachio/Config.lb @@ -42,7 +42,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/acpi/*.asl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/amd/serengeti_cheetah/Config.lb b/src/mainboard/amd/serengeti_cheetah/Config.lb index da5a901e3e..d4e6eff01a 100644 --- a/src/mainboard/amd/serengeti_cheetah/Config.lb +++ b/src/mainboard/amd/serengeti_cheetah/Config.lb @@ -44,7 +44,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/dx/dsdt_lb.dsl" - action "iasl -p $(PWD)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl" + action "iasl -p $(CURDIR)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl" action "mv dsdt_lb.hex dsdt.c" end object ./dsdt.o @@ -54,21 +54,21 @@ if HAVE_ACPI_TABLES if ACPI_SSDTX_NUM makerule ssdt2.c depends "$(MAINBOARD)/dx/pci2.asl" - action "iasl -p $(PWD)/pci2 -tc $(MAINBOARD)/dx/pci2.asl" + action "iasl -p $(CURDIR)/pci2 -tc $(MAINBOARD)/dx/pci2.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex" action "mv pci2.hex ssdt2.c" end object ./ssdt2.o makerule ssdt3.c depends "$(MAINBOARD)/dx/pci3.asl" - action "iasl -p $(PWD)/pci3 -tc $(MAINBOARD)/dx/pci3.asl" + action "iasl -p $(CURDIR)/pci3 -tc $(MAINBOARD)/dx/pci3.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex" action "mv pci3.hex ssdt3.c" end object ./ssdt3.o makerule ssdt4.c depends "$(MAINBOARD)/dx/pci4.asl" - action "iasl -p $(PWD)/pci4 -tc $(MAINBOARD)/dx/pci4.asl" + action "iasl -p $(CURDIR)/pci4 -tc $(MAINBOARD)/dx/pci4.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex" action "mv pci4.hex ssdt4.c" end diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb index 5c48889bcf..6d3856e7c0 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb @@ -44,7 +44,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/dx/dsdt_lb.dsl" - action "iasl -p $(PWD)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl" + action "iasl -p $(CURDIR)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl" action "mv dsdt_lb.hex dsdt.c" end object ./dsdt.o @@ -54,28 +54,28 @@ if HAVE_ACPI_TABLES if ACPI_SSDTX_NUM makerule ssdt2.c depends "$(MAINBOARD)/dx/pci2.asl" - action "iasl -p $(PWD)/pci2 -tc $(MAINBOARD)/dx/pci2.asl" + action "iasl -p $(CURDIR)/pci2 -tc $(MAINBOARD)/dx/pci2.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex" action "mv pci2.hex ssdt2.c" end object ./ssdt2.o makerule ssdt3.c depends "$(MAINBOARD)/dx/pci3.asl" - action "iasl -p $(PWD)/pci3 -tc $(MAINBOARD)/dx/pci3.asl" + action "iasl -p $(CURDIR)/pci3 -tc $(MAINBOARD)/dx/pci3.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex" action "mv pci3.hex ssdt3.c" end object ./ssdt3.o makerule ssdt4.c depends "$(MAINBOARD)/dx/pci4.asl" - action "iasl -p $(PWD)/pci4 -tc $(MAINBOARD)/dx/pci4.asl" + action "iasl -p $(CURDIR)/pci4 -tc $(MAINBOARD)/dx/pci4.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex" action "mv pci4.hex ssdt4.c" end object ./ssdt4.o makerule ssdt5.c depends "$(MAINBOARD)/dx/pci5.asl" - action "iasl -p $(PWD)/pci5 -tc $(MAINBOARD)/dx/pci5.asl" + action "iasl -p $(CURDIR)/pci5 -tc $(MAINBOARD)/dx/pci5.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' pci5.hex" action "mv pci5.hex ssdt5.c" end diff --git a/src/mainboard/asus/a8v-e_se/Config.lb b/src/mainboard/asus/a8v-e_se/Config.lb index a1ee61ccb6..fa9a0ab7da 100644 --- a/src/mainboard/asus/a8v-e_se/Config.lb +++ b/src/mainboard/asus/a8v-e_se/Config.lb @@ -31,7 +31,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/dsdt.asl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.asl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.asl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/asus/m2v-mx_se/Config.lb b/src/mainboard/asus/m2v-mx_se/Config.lb index 461be2b59f..cb7d9b5841 100644 --- a/src/mainboard/asus/m2v-mx_se/Config.lb +++ b/src/mainboard/asus/m2v-mx_se/Config.lb @@ -30,7 +30,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/dsdt.asl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.asl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.asl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/iwill/dk8_htx/Config.lb b/src/mainboard/iwill/dk8_htx/Config.lb index 88c421a93e..accc6f6b60 100644 --- a/src/mainboard/iwill/dk8_htx/Config.lb +++ b/src/mainboard/iwill/dk8_htx/Config.lb @@ -44,7 +44,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/dx/dsdt_lb.dsl" - action "iasl -p $(PWD)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl" + action "iasl -p $(CURDIR)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl" action "mv dsdt_lb.hex dsdt.c" end object ./dsdt.o @@ -54,28 +54,28 @@ if HAVE_ACPI_TABLES if ACPI_SSDTX_NUM makerule ssdt2.c depends "$(MAINBOARD)/dx/pci2.asl" - action "iasl -p $(PWD)/pci2 -tc $(MAINBOARD)/dx/pci2.asl" + action "iasl -p $(CURDIR)/pci2 -tc $(MAINBOARD)/dx/pci2.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex" action "mv pci2.hex ssdt2.c" end object ./ssdt2.o makerule ssdt3.c depends "$(MAINBOARD)/dx/pci3.asl" - action "iasl -p $(PWD)/pci3 -tc $(MAINBOARD)/dx/pci3.asl" + action "iasl -p $(CURDIR)/pci3 -tc $(MAINBOARD)/dx/pci3.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex" action "mv pci3.hex ssdt3.c" end object ./ssdt3.o makerule ssdt4.c depends "$(MAINBOARD)/dx/pci4.asl" - action "iasl -p $(PWD)/pci4 -tc $(MAINBOARD)/dx/pci4.asl" + action "iasl -p $(CURDIR)/pci4 -tc $(MAINBOARD)/dx/pci4.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex" action "mv pci4.hex ssdt4.c" end object ./ssdt4.o makerule ssdt5.c depends "$(MAINBOARD)/dx/pci5.asl" - action "iasl -p $(PWD)/pci5 -tc $(MAINBOARD)/dx/pci5.asl" + action "iasl -p $(CURDIR)/pci5 -tc $(MAINBOARD)/dx/pci5.asl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' pci5.hex" action "mv pci5.hex ssdt5.c" end diff --git a/src/mainboard/kontron/986lcd-m/Config.lb b/src/mainboard/kontron/986lcd-m/Config.lb index a3eeea1778..1b67906502 100644 --- a/src/mainboard/kontron/986lcd-m/Config.lb +++ b/src/mainboard/kontron/986lcd-m/Config.lb @@ -52,7 +52,7 @@ if HAVE_ACPI_TABLES makerule dsdt.c depends "$(MAINBOARD)/dsdt.asl" action "iasl -p dsdt -tc $(MAINBOARD)/dsdt.asl" - action "mv $(PWD)/dsdt.hex dsdt.c" + action "mv $(CURDIR)/dsdt.hex dsdt.c" end object ./dsdt.o end diff --git a/src/mainboard/technexion/tim8690/Config.lb b/src/mainboard/technexion/tim8690/Config.lb index f82c8f41df..d18eec931f 100644 --- a/src/mainboard/technexion/tim8690/Config.lb +++ b/src/mainboard/technexion/tim8690/Config.lb @@ -42,7 +42,7 @@ if HAVE_ACPI_TABLES object fadt.o makerule dsdt.c depends "$(MAINBOARD)/acpi/*.asl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/tyan/s2891/Config.lb b/src/mainboard/tyan/s2891/Config.lb index 638c557f29..995a22247d 100644 --- a/src/mainboard/tyan/s2891/Config.lb +++ b/src/mainboard/tyan/s2891/Config.lb @@ -22,7 +22,7 @@ if HAVE_ACPI_TABLES object acpi_tables.o makerule dsdt.c depends "$(MAINBOARD)/dsdt.dsl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.dsl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/tyan/s2892/Config.lb b/src/mainboard/tyan/s2892/Config.lb index 0f2681fe93..c824ede6cc 100644 --- a/src/mainboard/tyan/s2892/Config.lb +++ b/src/mainboard/tyan/s2892/Config.lb @@ -23,7 +23,7 @@ if HAVE_ACPI_TABLES object acpi_tables.o makerule dsdt.c depends "$(MAINBOARD)/dsdt.dsl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.dsl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/mainboard/tyan/s2895/Config.lb b/src/mainboard/tyan/s2895/Config.lb index 5a4d77b550..8edb5d4c59 100644 --- a/src/mainboard/tyan/s2895/Config.lb +++ b/src/mainboard/tyan/s2895/Config.lb @@ -18,7 +18,7 @@ if HAVE_ACPI_TABLES object acpi_tables.o makerule dsdt.c depends "$(MAINBOARD)/dsdt.dsl" - action "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.dsl" + action "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl" action "mv dsdt.hex dsdt.c" end object ./dsdt.o diff --git a/src/northbridge/amd/amdfam10/Config.lb b/src/northbridge/amd/amdfam10/Config.lb index 79b7b49280..4f84115d77 100644 --- a/src/northbridge/amd/amdfam10/Config.lb +++ b/src/northbridge/amd/amdfam10/Config.lb @@ -33,42 +33,42 @@ if HAVE_ACPI_TABLES object amdfam10_acpi.o makerule ssdt.c depends "$(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl" - action "iasl -p $(PWD)/ssdt -tc $(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl" + action "iasl -p $(CURDIR)/ssdt -tc $(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl" action "perl -pi -e 's/AmlCode/AmlCode_ssdt/g' ssdt.hex" action "mv ssdt.hex ssdt.c" end object ./ssdt.o makerule sspr1.c depends "$(TOP)/src/northbridge/amd/amdfam10/sspr1.dsl" - action "iasl -p $(PWD)/sspr1 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr1.dsl" + action "iasl -p $(CURDIR)/sspr1 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr1.dsl" action "perl -pi -e 's/AmlCode/AmlCode_sspr1/g' sspr1.hex" action "mv sspr1.hex sspr1.c" end object ./sspr1.o makerule sspr2.c depends "$(TOP)/src/northbridge/amd/amdfam10/sspr2.dsl" - action "iasl -p $(PWD)/sspr2 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr2.dsl" + action "iasl -p $(CURDIR)/sspr2 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr2.dsl" action "perl -pi -e 's/AmlCode/AmlCode_sspr2/g' sspr2.hex" action "mv sspr2.hex sspr2.c" end object ./sspr2.o makerule sspr3.c depends "$(TOP)/src/northbridge/amd/amdfam10/sspr3.dsl" - action "iasl -p $(PWD)/sspr3 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr3.dsl" + action "iasl -p $(CURDIR)/sspr3 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr3.dsl" action "perl -pi -e 's/AmlCode/AmlCode_sspr3/g' sspr3.hex" action "mv sspr3.hex sspr3.c" end object ./sspr3.o makerule sspr4.c depends "$(TOP)/src/northbridge/amd/amdfam10/sspr4.dsl" - action "iasl -p $(PWD)/sspr4 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr4.dsl" + action "iasl -p $(CURDIR)/sspr4 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr4.dsl" action "perl -pi -e 's/AmlCode/AmlCode_sspr4/g' sspr4.hex" action "mv sspr4.hex sspr4.c" end object ./sspr4.o makerule sspr5.c depends "$(TOP)/src/northbridge/amd/amdfam10/sspr5.dsl" - action "iasl -p $(PWD)/sspr5 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr5.dsl" + action "iasl -p $(CURDIR)/sspr5 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr5.dsl" action "perl -pi -e 's/AmlCode/AmlCode_sspr5/g' sspr5.hex" action "mv sspr5.hex sspr5.c" end |