Skip to content

Commit

Permalink
Further cleanup of ld directory.
Browse files Browse the repository at this point in the history
Renamed the main linker script to make it clear it is customised for NodeMCU
and not to be confused with the standard linker SDK linker scripts.

Changed to using the eagle.rom.addr.v6.ld file from the SDK.
  • Loading branch information
jmattsson committed Oct 12, 2015
1 parent 7d0b13d commit 30380f6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 359 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SDK_VER:=1.4.0
TOP_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
SDK_DIR:=$(TOP_DIR)sdk/esp_iot_sdk_v$(SDK_VER)
CCFLAGS:= -I$(TOP_DIR)sdk-overrides/include -I$(SDK_DIR)/include
LDFLAGS:= -L$(SDK_DIR)/lib $(LDFLAGS)
LDFLAGS:= -L$(SDK_DIR)/lib -L$(SDK_DIR)/ld $(LDFLAGS)

#############################################################
# Select compile
Expand Down
11 changes: 1 addition & 10 deletions app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,7 @@ ifeq ($(FLAVOR),release)
TARGET_LDFLAGS += -Os
endif

LD_FILE = $(LDDIR)/eagle.app.v6.ld

ifeq ($(APP), 1)
LD_FILE = $(LDDIR)/eagle.app.v6.app1.ld
endif

ifeq ($(APP), 2)
LD_FILE = $(LDDIR)/eagle.app.v6.app2.ld
endif
LD_FILE = $(LDDIR)/nodemcu.ld

COMPONENTS_eagle.app.v6 = \
user/libuser.a \
Expand Down Expand Up @@ -123,7 +115,6 @@ LINKFLAGS_eagle.app.v6 = \

DEPENDS_eagle.app.v6 = \
$(LD_FILE) \
$(LDDIR)/eagle.rom.addr.v6.ld

#############################################################
# Configuration i.e. compile options etc.
Expand Down
347 changes: 0 additions & 347 deletions ld/eagle.rom.addr.v6.ld

This file was deleted.

2 changes: 1 addition & 1 deletion ld/eagle.app.v6.ld → ld/nodemcu.ld
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,4 @@ SECTIONS
}

/* get ROM code address */
INCLUDE "../ld/eagle.rom.addr.v6.ld"
INCLUDE "eagle.rom.addr.v6.ld"

0 comments on commit 30380f6

Please sign in to comment.