diff --git a/firmware/common/LPC43xx_M4_M0_image_from_spifi.ld b/firmware/common/LPC43xx_M4_M0_image_from_text.ld similarity index 100% rename from firmware/common/LPC43xx_M4_M0_image_from_spifi.ld rename to firmware/common/LPC43xx_M4_M0_image_from_text.ld diff --git a/firmware/common/LPC43xx_M4_M0_image_in_ram.ld b/firmware/common/LPC43xx_M4_M0_image_in_ram.ld deleted file mode 100644 index 53eca09b..00000000 --- a/firmware/common/LPC43xx_M4_M0_image_in_ram.ld +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2012 Michael Ossmann - * Copyright 2012 Jared Boone - * - * This file is part of HackRF - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -SECTIONS -{ - .m0 ORIGIN(ram_m0) : { - PROVIDE(__m0_start__ = .); - KEEP(*(.m0_bin*)); - . = ALIGN(4); - PROVIDE(__m0_end__ = .); - } >ram_m0 -} diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index b6d52f66..e92d8112 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -70,11 +70,10 @@ OBJ_M0_S = $(patsubst %.s, $(OBJDIR_M0)/%.o, $(notdir $(SRC_M0_S))) LDSCRIPT_M4 += -T$(PATH_HACKRF_FIRMWARE_COMMON)/$(MCU_PARTNO)_M4_memory.ld ifeq ($(RUN_FROM),RAM) LDSCRIPT_M4 += -Tlibopencm3_lpc43xx.ld - LDSCRIPT_M4 += -T$(PATH_HACKRF_FIRMWARE_COMMON)/LPC43xx_M4_M0_image_in_ram.ld else LDSCRIPT_M4 += -Tlibopencm3_lpc43xx_rom_to_ram.ld - LDSCRIPT_M4 += -T$(PATH_HACKRF_FIRMWARE_COMMON)/LPC43xx_M4_M0_image_from_spifi.ld endif +LDSCRIPT_M4 += -T$(PATH_HACKRF_FIRMWARE_COMMON)/LPC43xx_M4_M0_image_from_text.ld LDSCRIPT_M0 += -T$(PATH_HACKRF_FIRMWARE_COMMON)/LPC43xx_M0_memory.ld LDSCRIPT_M0 += -Tlibopencm3_lpc43xx_m0.ld