diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 55a6946c61..216985340a 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -95,7 +95,7 @@ $(PLUGINLIB): $(PLUGINLIB_OBJ) $(PLUGINLINK_LDS): $(PLUGIN_LDS) $(CONFIGFILE) $(call PRINTS,PP $(@F)) $(shell mkdir -p $(dir $@)) - $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) + $(call preprocess2file,$<,$@,) $(OVERLAYREF_LDS): $(PLUGIN_LDS) $(call PRINTS,PP $(@F)) diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make index 25c49da011..06055068e5 100644 --- a/bootloader/bootloader.make +++ b/bootloader/bootloader.make @@ -23,7 +23,7 @@ EXTRA_SPECIAL_LIBS = $(call a2lnk, $(CORE_LIBS)) $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) $(call PRINTS,PP $(@F)) - $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) + $(call preprocess2file,$<,$@,) $(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK) $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ diff --git a/tools/configure b/tools/configure index b68709b90a..7e48cc93a1 100755 --- a/tools/configure +++ b/tools/configure @@ -4909,7 +4909,6 @@ export APPLICATION=${application} export SIMDIR=\$(ROOTDIR)/uisimulator/sdl export GCCOPTS=${GCCOPTS} export TARGET_INC=${TARGET_INC} -export LOADADDRESS=${loadaddress} export SHARED_LDFLAGS=${SHARED_LDFLAGS} export SHARED_CFLAGS=${SHARED_CFLAGS} export LDOPTS=${LDOPTS} diff --git a/tools/root.make b/tools/root.make index e177057ecb..4423d21359 100644 --- a/tools/root.make +++ b/tools/root.make @@ -260,11 +260,11 @@ LINKROM := $(BUILDDIR)/rom.link $(LINKRAM): $(RAMLDS) $(CONFIGFILE) $(call PRINTS,PP $(@F)) - $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) + $(call preprocess2file,$<,$@,) $(LINKROM): $(ROMLDS) $(call PRINTS,PP $(@F)) - $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) + $(call preprocess2file,$<,$@,) # Note: make sure -Wl,--gc-sections comes before -T in the linker options. # Having the latter first caused crashes on (at least) mini2g.