Revert "Import firmware compiler flags"

This reverts commit 440ad516c4840882557bfb76ddf497ea0041fc03.

BUG=
TEST=

Review URL: http://codereview.chromium.org/6396002

Change-Id: I6b241e418cbba62c9dc82549f2a5c7a9485db1df

1 files changed, 6 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 94d1f027..36250fb6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,33 +3,19 @@
 # found in the LICENSE file.
 
 export FIRMWARE_ARCH
-export FIRMWARE_CONFIG_PATH
 
 export CC ?= gcc
 export CXX ?= g++
-export CFLAGS
-
-# Include compiler flags if provided.
-# The CC and CFLAGS should not be overridden hereafter.
-ifneq ($(FIRMWARE_CONFIG_PATH),)
-include $(FIRMWARE_CONFIG_PATH)
-endif
-
-# Provides default optimization level if not set by FIRMWARE_CONFIG_PATH
-ifeq (${DEBUG},)
-CFLAGS ?= -O3
-else
-CFLAGS ?= -O0
-endif
-
 ifeq ($(FIRMWARE_ARCH),)
-CFLAGS += -Wall -Werror -DCHROMEOS_ENVIRONMENT
+export CFLAGS = -Wall -Werror -DCHROMEOS_ENVIRONMENT
 else
-CFLAGS += -Wall -Werror
+export CFLAGS = -Wall -Werror
 endif
 
-ifneq (${DEBUG},)
-CFLAGS += -g -DVBOOT_DEBUG
+ifeq (${DEBUG},)
+CFLAGS += -O3
+else
+CFLAGS += -O0 -g -DVBOOT_DEBUG
 endif
 
 ifeq (${DISABLE_NDEBUG},)