jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34474?usp=email ) Change subject: HACK, DON'T MERGE!: make firmware compile with write/flash support ...................................................................... HACK, DON'T MERGE!: make firmware compile with write/flash support Change-Id: Ibc83a0beb9c716026f681232abe98a85bfa5ab5c --- M src/target/firmware/Makefile M src/target/firmware/Makefile.inc 2 files changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/34474/1 diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 18450ac..1b657e9 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -117,7 +117,8 @@ # Applications specific env requirements APP_loader_ENVIRONMENTS=compalram highram -APP_rssi_ENVIRONMENTS=* -compalram +APP_rssi_ENVIRONMENTS=* -compalram -e88loader -e88flash +APP_layer1_ENVIRONMENTS=* -compalram APP_menu_ENVIRONMENTS=* -highram # Various objects that are currently linked into all applications @@ -159,10 +160,10 @@ # # Uncomment this line if you want to enable Tx (Transmit) Support. -#CFLAGS += -DCONFIG_TX_ENABLE +CFLAGS += -DCONFIG_TX_ENABLE # Uncomment this line if you want to write to flash. -#CFLAGS += -DCONFIG_FLASH_WRITE +CFLAGS += -DCONFIG_FLASH_WRITE # Uncomment this line if you want to write to flash, including the bootloader. -#CFLAGS += -DCONFIG_FLASH_WRITE_LOADER +CFLAGS += -DCONFIG_FLASH_WRITE_LOADER diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 2be240d..6bcd14c 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -22,7 +22,7 @@ #ASFLAGS=--g$(DEBUGF) $(INCLUDES) -D__ASSEMBLY__ ASFLAGS=$(INCLUDES) -D__ASSEMBLY__ -LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs --gc-sections --cref +CXXFLAGS = -nostartfiles -nostdlib -nodefaultlibs --gc-sections --cref #### QUIET OUTPUT #### -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibc83a0beb9c716026f681232abe98a85bfa5ab5c Gerrit-Change-Number: 34474 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange