Merge remote-tracking branch 'origin/master' into ether-1

Makefile

@@ -93,7 +93,7 @@ APPNAME = "Wanchain"
 else ifeq ($(CHAIN),kusd)
 APP_LOAD_PARAMS += --path "44'/91927009'"
 DEFINES += CHAINID_UPCASE=\"KUSD\" CHAINID_COINNAME=\"KUSD\" CHAIN_KIND=CHAIN_KIND_KUSD CHAIN_ID=1
-APPNAME = "KUSD"
+APPNAME = "kUSD"
 else ifeq ($(CHAIN),musicoin)
 APP_LOAD_PARAMS += --path "44'/184'"
 DEFINES += CHAINID_UPCASE=\"MUSICOIN\" CHAINID_COINNAME=\"MUSIC\" CHAIN_KIND=CHAIN_KIND_MUSICOIN CHAIN_ID=7762959
@@ -196,4 +196,4 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile.genericwallet
 
 listvariants:
-	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk ubiq wanchain kusd #musicoin callisto ethersocial ellaism pirl akroma ether1
+	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd #musicoin callisto ethersocial ellaism pirl akroma ether1

Makefile.chainsplit

@@ -1,170 +0,0 @@
-#*******************************************************************************
-#   Ledger Blue
-#   (c) 2016 Ledger
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#*******************************************************************************
-
-APPNAME = "ETC/ETH Split"
-TARGET_ID = 0x31100002 #Nano S
-#TARGET_ID = 0x31000002 #Blue
-APP_LOAD_PARAMS=--appFlags 0x40 --path "44'/60'" --path "44'/61'" --curve secp256k1
-
-
-################
-# Default rule #
-################
-
-all: default
-
-# consider every intermediate target as final to avoid deleting intermediate files
-.SECONDARY:
-
-# disable builtin rules that overload the build process (and the debug log !!)
-.SUFFIXES:
-MAKEFLAGS += -r
-
-SHELL =       /bin/bash
-#.ONESHELL:
-
-
-############
-# Platform #
-############
-PROG     := token-chainsplit
-
-CONFIG_PRODUCTIONS := bin/$(PROG)
-
-SOURCE_PATH   := src_chainsplit $(BOLOS_SDK)/src $(dir $(shell find $(BOLOS_SDK)/lib_stusb* | grep "\.c$$")) src_common  
-SOURCE_FILES  := $(foreach path, $(SOURCE_PATH),$(shell find $(path) | grep "\.c$$") )
-INCLUDES_PATH := $(dir $(shell find $(BOLOS_SDK)/lib_stusb* | grep "\.h$$")) include src_chainsplit $(BOLOS_SDK)/include $(BOLOS_SDK)/include/arm src_common 
-
-### platform definitions
-DEFINES := ST31 gcc __IO=volatile
-
-DEFINES   += OS_IO_SEPROXYHAL IO_SEPROXYHAL_BUFFER_SIZE_B=128
-DEFINES   += HAVE_BAGL HAVE_PRINTF 
-DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
-
-##############
-# Compiler #
-##############
-GCCPATH   := $(BOLOS_ENV)/gcc-arm-none-eabi-5_3-2016q1/bin/
-CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin
-CC       := $(CLANGPATH)/clang 
-
-CFLAGS   := 
-CFLAGS   += -gdwarf-2  -gstrict-dwarf 
-#CFLAGS   += -O0
-#CFLAGS   += -O0 -g3
-CFLAGS   += -O3 -Os
-CFLAGS   += -mcpu=cortex-m0 -mthumb 
-CFLAGS   += -fno-common -mtune=cortex-m0 -mlittle-endian 
-CFLAGS   += -std=gnu99 -Werror=int-to-pointer-cast -Wall -Wextra #-save-temps
-CFLAGS   += -fdata-sections -ffunction-sections -funsigned-char -fshort-enums 
-CFLAGS   += -mno-unaligned-access 
-CFLAGS   += -Wno-unused-parameter -Wno-duplicate-decl-specifier
-
-CFLAGS   += -fropi --target=armv6m-none-eabi
-#CFLAGS   += -finline-limit-0 -funsigned-bitfields 
-
-AS     := $(GCCPATH)/arm-none-eabi-gcc
-AFLAGS += -ggdb2 -O3 -Os -mcpu=cortex-m0 -fno-common -mtune=cortex-m0
-
-# NOT SUPPORTED BY STM3L152 CFLAGS   += -fpack-struct
-#-pg --coverage
-LD       := $(GCCPATH)/arm-none-eabi-gcc
-LDFLAGS  := 
-LDFLAGS  += -gdwarf-2  -gstrict-dwarf 
-#LDFLAGS  += -O0 -g3
-LDFLAGS  += -O3 -Os
-#LDFLAGS  += -O0
-LDFLAGS  += -Wall 
-LDFLAGS  += -mcpu=cortex-m0 -mthumb 
-LDFLAGS  += -fno-common -ffunction-sections -fdata-sections -fwhole-program -nostartfiles 
-LDFLAGS  += -mno-unaligned-access
-#LDFLAGS  += -nodefaultlibs
-#LDFLAGS  += -nostdlib -nostdinc
-LDFLAGS  += -T$(BOLOS_SDK)/script.ld  -Wl,--gc-sections -Wl,-Map,debug/$(PROG).map,--cref
-LDLIBS   += -Wl,--library-path -Wl,$(GCCPATH)/../lib/armv6-m/
-#LDLIBS   += -Wl,--start-group 
-LDLIBS   += -lm -lgcc -lc 
-#LDLIBS   += -Wl,--end-group
-# -mno-unaligned-access 
-#-pg --coverage
-
-### computed variables
-VPATH := $(dir $(SOURCE_FILES))
-OBJECT_FILES := $(sort $(addprefix obj/, $(addsuffix .o, $(basename $(notdir $(SOURCE_FILES))))))
-DEPEND_FILES := $(sort $(addprefix dep/, $(addsuffix .d, $(basename $(notdir $(SOURCE_FILES))))))
-
-ifeq ($(filter clean,$(MAKECMDGOALS)),)
--include $(DEPEND_FILES)
-endif
-
-clean:
-	rm -fr obj bin debug dep
-
-prepare:
-	@mkdir -p bin obj debug dep
-
-.SECONDEXPANSION:
-
-# default is not to display make commands
-log = $(if $(strip $(VERBOSE)),$1,@$1)
-
-default: prepare bin/$(PROG)
-
-load:
-	python -m ledgerblue.loadApp --targetId $(TARGET_ID) --fileName bin/$(PROG).hex --appName $(APPNAME) --icon `python $(BOLOS_SDK)/icon.py 16 16 icon_split.gif hexbitmaponly` $(APP_LOAD_PARAMS)
-
-delete:
-	python -m ledgerblue.deleteApp --targetId $(TARGET_ID) --appName $(APPNAME)
-
-bin/$(PROG): $(OBJECT_FILES) $(BOLOS_SDK)/script.ld
-	@echo "[LINK] 	$@"
-	$(call log,$(call link_cmdline,$(OBJECT_FILES) $(LDLIBS),$@))
-	$(call log,$(GCCPATH)/arm-none-eabi-objcopy -O ihex -S bin/$(PROG) bin/$(PROG).hex)
-	$(call log,mv bin/$(PROG) bin/$(PROG).elf)
-	$(call log,cp bin/$(PROG).elf obj)
-	$(call log,$(GCCPATH)/arm-none-eabi-objdump -S -d bin/$(PROG).elf > debug/$(PROG).asm)
-
-dep/%.d: %.c Makefile.chainsplit
-	@echo "[DEP]    $@"
-	@mkdir -p dep
-	$(call log,$(call dep_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@))
-
-obj/%.o: %.c dep/%.d
-	@echo "[CC]	$@"
-	$(call log,$(call cc_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@))
-
-obj/%.o: %.s
-	@echo "[CC]	$@"
-	$(call log,$(call as_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@))
-
-
-### BEGIN GCC COMPILER RULES
-
-# link_cmdline(objects,dest)		Macro that is used to format arguments for the linker
-link_cmdline = $(LD) $(LDFLAGS) -o $(2) $(1)
-
-# dep_cmdline(include,defines,src($<),dest($@))	Macro that is used to format arguments for the dependency creator
-dep_cmdline = $(CC) -M $(CFLAGS) $(addprefix -D,$(2)) $(addprefix -I,$(1)) $(3) | sed 's/\($*\)\.o[ :]*/obj\/\1.o: /g' | sed -e 's/[:\t ][^ ]\+\.c//g' > dep/$(basename $(notdir $(4))).d 2>/dev/null
-
-# cc_cmdline(include,defines,src,dest)	Macro that is used to format arguments for the compiler
-cc_cmdline = $(CC) -c $(CFLAGS) $(addprefix -D,$(2)) $(addprefix -I,$(1)) -o $(4) $(3)
-
-as_cmdline = $(AS) -c $(AFLAGS) $(addprefix -D,$(2)) $(addprefix -I,$(1)) -o $(4) $(3)
-
-### END GCC COMPILER RULES
-

Makefile.daosend

@@ -1,170 +0,0 @@
-#*******************************************************************************
-#   Ledger Blue
-#   (c) 2016 Ledger
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#*******************************************************************************
-
-APPNAME = DAOSND 
-
-
-################
-# Default rule #
-################
-
-all: default
-
-# consider every intermediate target as final to avoid deleting intermediate files
-.SECONDARY:
-
-# disable builtin rules that overload the build process (and the debug log !!)
-.SUFFIXES:
-MAKEFLAGS += -r
-
-SHELL =       /bin/bash
-#.ONESHELL:
-
-
-############
-# Platform #
-############
-PROG     := token-daosend
-
-CONFIG_PRODUCTIONS := bin/$(PROG)
-
-SOURCE_PATH   := src_daosend $(BOLOS_SDK)/src src_usb src_common src_tmp 
-SOURCE_FILES  := $(foreach path, $(SOURCE_PATH),$(shell find $(path) | grep "\.c$$") )
-INCLUDES_PATH := src_usb $(dir $(shell find src_usb/ | grep "\.h$$")) include src_daosend $(BOLOS_SDK)/include $(BOLOS_SDK)/include/arm src_common src_tmp
-
-### platform definitions
-DEFINES := ST31 gcc __IO=volatile
-
-DEFINES   += OS_IO_SEPROXYHAL IO_SEPROXYHAL_BUFFER_SIZE_B=300
-DEFINES   += HAVE_BAGL HAVE_PRINTF 
-DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64
-DEFINES	  += HAVE_BLE
-
-##############
-# Compiler #
-##############
-GCCPATH   := $(BOLOS_ENV)/gcc-arm-none-eabi-5_3-2016q1/bin/
-CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin
-CC       := $(CLANGPATH)/clang 
-
-CFLAGS   := 
-CFLAGS   += -gdwarf-2  -gstrict-dwarf 
-CFLAGS   += -O0
-#CFLAGS   += -O0 -g3
-#CFLAGS   += -O3 -Os
-CFLAGS   += -mcpu=cortex-m0 -mthumb 
-CFLAGS   += -fno-common -mtune=cortex-m0 -mlittle-endian 
-CFLAGS   += -std=gnu99 -Werror=int-to-pointer-cast -Wall -Wextra #-save-temps
-CFLAGS   += -fdata-sections -ffunction-sections -funsigned-char -fshort-enums 
-CFLAGS   += -mno-unaligned-access 
-CFLAGS   += -Wno-unused-parameter -Wno-duplicate-decl-specifier
-
-CFLAGS   += -fropi --target=armv6m-none-eabi
-#CFLAGS   += -finline-limit-0 -funsigned-bitfields 
-
-AS     := $(GCCPATH)/arm-none-eabi-gcc
-AFLAGS += -ggdb2 -O3 -Os -mcpu=cortex-m0 -fno-common -mtune=cortex-m0
-
-# NOT SUPPORTED BY STM3L152 CFLAGS   += -fpack-struct
-#-pg --coverage
-LD       := $(GCCPATH)/arm-none-eabi-gcc
-LDFLAGS  := 
-LDFLAGS  += -gdwarf-2  -gstrict-dwarf 
-#LDFLAGS  += -O0 -g3
-LDFLAGS  += -O3 -Os
-#LDFLAGS  += -O0
-LDFLAGS  += -Wall 
-LDFLAGS  += -mcpu=cortex-m0 -mthumb 
-LDFLAGS  += -fno-common -ffunction-sections -fdata-sections -fwhole-program -nostartfiles 
-LDFLAGS  += -mno-unaligned-access
-#LDFLAGS  += -nodefaultlibs
-#LDFLAGS  += -nostdlib -nostdinc
-LDFLAGS  += -Tscript.ld  -Wl,--gc-sections -Wl,-Map,debug/$(PROG).map,--cref
-LDLIBS   += -Wl,--library-path -Wl,$(GCCPATH)/../lib/armv6-m/
-#LDLIBS   += -Wl,--start-group 
-LDLIBS   += -lm -lgcc -lc 
-#LDLIBS   += -Wl,--end-group
-# -mno-unaligned-access 
-#-pg --coverage
-
-### computed variables
-VPATH := $(dir $(SOURCE_FILES))
-OBJECT_FILES := $(sort $(addprefix obj/, $(addsuffix .o, $(basename $(notdir $(SOURCE_FILES))))))
-DEPEND_FILES := $(sort $(addprefix dep/, $(addsuffix .d, $(basename $(notdir $(SOURCE_FILES))))))
-
-ifeq ($(filter clean,$(MAKECMDGOALS)),)
--include $(DEPEND_FILES)
-endif
-
-clean:
-	rm -fr obj bin debug dep
-
-prepare:
-	@mkdir -p bin obj debug dep
-	$(info $(SOURCE_FILES))
-	$(info $(DEPEND_FILES))
-
-.SECONDEXPANSION:
-
-# default is not to display make commands
-log = $(if $(strip $(VERBOSE)),$1,@$1)
-
-default: prepare bin/$(PROG)
-
-load: 
-	python -m ledgerblue.loadApp --appFlags 0xc0 --fileName bin/$(PROG).hex --appName $(APPNAME)
-
-delete:
-	python -m ledgerblue.deleteApp --appName $(APPNAME)
-
-bin/$(PROG): $(OBJECT_FILES) script.ld
-	@echo "[LINK] 	$@"
-	$(call log,$(call link_cmdline,$(OBJECT_FILES) $(LDLIBS),$@))
-	$(call log,$(GCCPATH)/arm-none-eabi-objcopy -O ihex -S bin/$(PROG) bin/$(PROG).hex)
-	$(call log,mv bin/$(PROG) bin/$(PROG).elf)
-	$(call log,cp bin/$(PROG).elf obj)
-	$(call log,$(GCCPATH)/arm-none-eabi-objdump -S -d bin/$(PROG).elf > debug/$(PROG).asm)
-
-dep/%.d: %.c Makefile.daosend
-	@echo "[DEP]    $@"
-	@mkdir -p dep
-	$(call log,$(call dep_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@))
-
-obj/%.o: %.c dep/%.d
-	@echo "[CC]	$@"
-	$(call log,$(call cc_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@))
-
-obj/%.o: %.s
-	@echo "[CC]	$@"
-	$(call log,$(call as_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@))
-
-
-### BEGIN GCC COMPILER RULES
-
-# link_cmdline(objects,dest)		Macro that is used to format arguments for the linker
-link_cmdline = $(LD) $(LDFLAGS) -o $(2) $(1)
-
-# dep_cmdline(include,defines,src($<),dest($@))	Macro that is used to format arguments for the dependency creator
-dep_cmdline = $(CC) -M $(CFLAGS) $(addprefix -D,$(2)) $(addprefix -I,$(1)) $(3) | sed 's/\($*\)\.o[ :]*/obj\/\1.o: /g' | sed -e 's/[:\t ][^ ]\+\.c//g' > dep/$(basename $(notdir $(4))).d 2>/dev/null
-
-# cc_cmdline(include,defines,src,dest)	Macro that is used to format arguments for the compiler
-cc_cmdline = $(CC) -c $(CFLAGS) $(addprefix -D,$(2)) $(addprefix -I,$(1)) -o $(4) $(3)
-
-as_cmdline = $(AS) -c $(AFLAGS) $(addprefix -D,$(2)) $(addprefix -I,$(1)) -o $(4) $(3)
-
-### END GCC COMPILER RULES
-