Merge branch 'master' of github.com:clementleger/cypress_linux_tools

Conflicts:
	make/Makefile.cypress

Author: Clément Léger

README.md

@@ -2,6 +2,7 @@
 # DISCLAIMER
 
 This work is absolutely **not related** to cypress in any way.
+I am not to be liable for direct, indirect or consequential damages of your devices.
 
 ## Introduction
 
@@ -13,7 +14,7 @@ It has only been successfully tested with a CY8CKIT-049 42xx kit.
 The prerequisites are the following:
    - `gengetopt`
    - `make`
-   - `wine` (to run cyelftool when using makefile)
+   - `wine` (to run `cyelftool` when using makefile)
    - An arm toolchain (arm-none-eabi-)
 
 In order to build and install these utilities:
@@ -51,7 +52,7 @@ To build it, the `make` command should be sufficient.
 
 Thanks from https://github.com/gv1/hex2cyacd, the format is well explained and it was possible to write a C tool.
 ihex2cyacd is a an utility to create cyacd files from ihex files.
-In order to use it, the simplest way is to use it
+Using the Makefile.cypress will hide the usage.
 
 ### Usage
 
@@ -70,6 +71,7 @@ In order to use it, the simplest way is to use it
 
 A Makefile.cypress file is available in the repository in order to easily compile cydsn projects.
 Two variable are required to be set which are PSOC_CREATOR_DIR and PROJECT_DIR.
+Additionnally, An ARM toolchain is necessary. Code Sourcery ones are sufficient.
 The easiest way to use it is to create a Makefile with the following content
 
 ```
@@ -79,6 +81,7 @@ PROJECT_DIR := Path_to_project.cydsn
 include Makefile.cypress
 
 ```
+`cyelftool` is still used though wine (not reversed yet).
 
 Then type `make` to compile the application.
 Note that some old generated files may be outdated and can't compile.
@@ -92,4 +95,4 @@ The final cyacd file can be flashed using `cyhostboot`.
 ## Notes
 
 The `cyelftool` cypress utility has not yet been reversed.
-However thanks to wine, this utility can be used and 
+However thanks to wine, this utility can be used under Linux.

make/Makefile.cypress

@@ -1,30 +1,28 @@
 
 # Add a entry here to define a new platform
-CY8C42_flash_size := 32768
-CY8C42_flash_array_size := 32768
-CY8C42_flash_row_size := 128
-CY8C42_mcpu := cortex-m0
-CY8C42_cpu_dir := CortexM0
-CY8C42_bootloader_size := 4296
+CY8C49_flash_size := 32768
+CY8C49_flash_array_size := 32768
+CY8C49_flash_row_size := 128
+CY8C49_mcpu := cortex-m0
+CY8C49_cpu_dir := CortexM0
+CY8C49_bootloader_size := 4296
+CY8C49_psoc_type := PSoC4
 
 PROJECT_DIR ?= $(error PROJECT_DIR must be defined)
 PROJECT_NAME = $(basename $(notdir $(PROJECT_DIR)))
 PSOC_CREATOR_DIR ?= $(error PSOC_CREATOR_DIR must be defined)
 CROSS_COMPILE := arm-none-eabi-
-CPU_TYPE ?= CY8C42
-PSOC_TYPE ?= PSoC4
+CPU_TYPE ?= CY8C49
 
 # Special dir from cypress tools
 CYCOMPONENT_LIB := $(PSOC_CREATOR_DIR)/psoc/content/CyComponentLibrary/CyComponentLibrary.cylib/$($(CPU_TYPE)_cpu_dir)/ARM_GCC_493/Debug/CyComponentLibrary.a
 CYELFTOOL := $(PSOC_CREATOR_DIR)/bin/cyelftool.exe
 
-# Upload stuff
+BUILD_DIR ?= ./build
 UPLOAD_BAUDRATE	?= 115200
 SERIAL_PORT	?= /dev/ttyACM0
- 
-# Directory
-GEN_SRC_DIR := Generated_Source/$(PSOC_TYPE)/
-BUILD_DIR ?= ./build
+
+GEN_SRC_DIR := Generated_Source/$($(CPU_TYPE)_psoc_type)/
 
 COMMON_FLAGS := -mcpu=$($(CPU_TYPE)_mcpu) -mthumb
 
@@ -33,6 +31,8 @@ LFLAGS :=  -Wl,--gc-sections -Wl,-Map,$(BUILD_DIR)/$(PROJECT_NAME).map -L$(BUILD
 ASFLAGS := $(COMMON_FLAGS)
 INCLUDE_CFLAGS := -I$(PROJECT_DIR)/$(GEN_SRC_DIR) -I$(PROJECT_DIR)/
 
+
+
 SRC_C_FILES := $(wildcard $(PROJECT_DIR)/$(GEN_SRC_DIR)/*.c $(PROJECT_DIR)/*.c)
 BOOTASM_GNU := $(PROJECT_DIR)/$(GEN_SRC_DIR)/CyBootAsmGnu.s