Change abuild ROM_IMAGE_SIZE to match the standard s_c_fam10 Config.lb.

[coreboot.git] / src / config / Config.lb

diff --git a/src/config/Config.lb b/src/config/Config.lb
index e2daee3b45298205dd922d8583e704ebc6a00945..44278129236f4ae4e2bc64cc2a6cf9dcb5c51e51 100644 (file)
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -8,7 +8,7 @@ makedefine LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
 makedefine GCC_INC_DIR := $(shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
 
 makedefine CPPFLAGS := -I$(TOP)/src/include -I$(TOP)/src/arch/$(ARCH)/include -I$(GCC_INC_DIR) $(CPUFLAGS)
-makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin  -Wall
+makedefine CFLAGS := $(CPU_OPT) $(DISTRO_CFLAGS) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin  -Wall
 
 makedefine HOSTCFLAGS:= -Os -Wall
 
@@ -35,17 +35,18 @@ end
 makerule coreboot.a
         depends "$(OBJECTS)"
         action  "rm -f coreboot.a"
-        action  "ar cr coreboot.a $(OBJECTS)"
+        action  "$(CROSS_COMPILE)ar cr coreboot.a $(OBJECTS)"
 end
 
+
 makerule coreboot_ram.o
        depends "$(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)" 
-       action  "$(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)"
+       action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ c_start.o $(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)"
 end
 
 makerule coreboot_ram
        depends "coreboot_ram.o $(TOP)/src/config/coreboot_ram.ld ldoptions" 
-       action  "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_ram.ld coreboot_ram.o"
+       action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_ram.ld coreboot_ram.o"
        action  "$(CROSS_COMPILE)nm -n coreboot_ram | sort > coreboot_ram.map"
 end
 
@@ -78,17 +79,17 @@ if CONFIG_AP_CODE_IN_CAR
        makerule coreboot_apc.a
                depends "apc_auto.o"
                action  "rm -f coreboot_apc.a"
-               action  "ar cr coreboot_apc.a apc_auto.o"
+               action  "$(CROSS_COMPILE)ar cr coreboot_apc.a apc_auto.o"
        end
 
        makerule coreboot_apc.o
                depends "coreboot_apc.a c_start.o $(LIBGCC_FILE_NAME)"
-        action  "$(CC) -nostdlib -r -o $@ c_start.o coreboot_apc.a $(LIBGCC_FILE_NAME)"
+        action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ c_start.o coreboot_apc.a $(LIBGCC_FILE_NAME)"
        end
 
        makerule coreboot_apc
                depends "coreboot_apc.o $(TOP)/src/config/coreboot_apc.ld ldoptions"
-               action  "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_apc.ld coreboot_apc.o"
+               action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_apc.ld coreboot_apc.o"
                action  "$(CROSS_COMPILE)nm -n coreboot_apc | sort > coreboot_apc.map"
        end
 
@@ -121,7 +122,7 @@ makedefine COREBOOT_RAM_ROM:=coreboot_ram.rom
 
 makerule coreboot   
        depends "crt0.o $(INIT-OBJECTS) $(COREBOOT_APC) $(COREBOOT_RAM_ROM) ldscript.ld"
-       action  "$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS)"
+       action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS)"
        action  "$(CROSS_COMPILE)nm -n coreboot | sort > coreboot.map"
 end