From 6aef573a6554f3df75c351b8fafdebaecb010d19 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Fri, 21 Jun 2019 01:22:50 +0200
Subject: [PATCH] Revert "fix(openocd): config file support for second flash
bank"
This reverts commit 719ff6ea9c95183c12bd502d5b3726dddd90dd37.
---
bootloader/build_image.sh | 1 -
bootloader/crc_patch.py | 4 ++--
bootloader/main.c | 10 +++-------
epicardium/meson.build | 1 -
lib/card10/card10.c | 2 +-
.../Maxim/MAX32665/Source/GCC/max32665_core1.ld | 2 +-
lib/sdk/Libraries/MAX32665PeriphDriver/Source/flc.c | 5 -----
openocd/scripts/target/max32665.cfg | 4 +---
openocd/scripts/target/max32xxx.cfg | 5 -----
pycardium/meson.build | 11 +----------
10 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/bootloader/build_image.sh b/bootloader/build_image.sh
index f7b87a701..6d3e53ef8 100755
--- a/bootloader/build_image.sh
+++ b/bootloader/build_image.sh
@@ -1,7 +1,6 @@
#!/bin/sh
set -e
-echo "build image" $1 $2 $3
PYTHON="$1"
ELF="$2"
BIN="$3"
diff --git a/bootloader/crc_patch.py b/bootloader/crc_patch.py
index 1be4b06b8..21eeb57a5 100755
--- a/bootloader/crc_patch.py
+++ b/bootloader/crc_patch.py
@@ -6,12 +6,12 @@ crc = 0
data = open(sys.argv[1], 'rb').read()
crc = crc16.crc16xmodem(data)
-#print(crc)
+print(crc)
padded = data + bytes([crc >> 8, crc & 0xFF])
crc = 0
crc = crc16.crc16xmodem(padded)
-#print(crc)
+print(crc)
open(sys.argv[1], 'wb').write(padded)
diff --git a/bootloader/main.c b/bootloader/main.c
index f46a192ae..e62d88abb 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -20,11 +20,8 @@
#define PARTITION_START (0x10000000 + 64 * 1024)
-//#define PARTITION_END (0x10000000 + 512 * 1024 - 1) /* TODO: check if 1 MB also works. Might have to enable the second bank */
-#define PARTITION_END (0x10000000 + 1024 * 1024 - 1)
-
-//#define PARTITION_START (0x10080000)
-//#define PARTITION_END (0x10000000 + 1024 * 1024 - 1) /* TODO: check if 1 MB also works. Might have to enable the second bank */
+#define PARTITION_END (0x10000000 + 512 * 1024 - 1) /* TODO: check if 1 MB also works. Might have to enable the second bank */
+//#define PARTITION_END (0x10000000 + 1024 * 1024 - 1)
extern void run_usbmsc(void);
@@ -191,14 +188,13 @@ int main(void)
while(1);
}
- //MXC_FLC0->clkdiv = 96;
- //MXC_FLC0->clkdiv = 96;
if(mount()) {
if(check_integrity()) {
printf("Found valid application image\n");
if(is_update_needed()) {
printf("Trying to update application from external flash\n");
+ MXC_FLC0->clkdiv = 54;
erase_partition();
flash_partition();
} else {
diff --git a/epicardium/meson.build b/epicardium/meson.build
index 03fa835bb..767c9c4f9 100644
--- a/epicardium/meson.build
+++ b/epicardium/meson.build
@@ -60,7 +60,6 @@ custom_target(
name + '.bin',
build_by_default: true,
output: name + '.bin',
- #output: 'card10.bin',
input: elf,
command: [build_image, '@INPUT@', '@OUTPUT0@'],
)
diff --git a/lib/card10/card10.c b/lib/card10/card10.c
index df141a29d..da0a355c6 100644
--- a/lib/card10/card10.c
+++ b/lib/card10/card10.c
@@ -174,7 +174,7 @@ void card10_diag(void)
void core1_start(void) {
//MXC_GCR->gp0 = (uint32_t)(&__isr_vector_core1);
- MXC_GCR->gp0 = 0x10080000;
+ MXC_GCR->gp0 = 0x10040000;
MXC_GCR->perckcn1 &= ~MXC_F_GCR_PERCKCN1_CPU1;
}
diff --git a/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Source/GCC/max32665_core1.ld b/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Source/GCC/max32665_core1.ld
index 7612a2589..3978179d2 100644
--- a/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Source/GCC/max32665_core1.ld
+++ b/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Source/GCC/max32665_core1.ld
@@ -38,7 +38,7 @@
/* If used, they should be adjusted for the external Flash/RAM size */
MEMORY {
SPIX (rx) : ORIGIN = 0x08000000, LENGTH = 128M
- FLASH (rx) : ORIGIN = 0x10080000, LENGTH = 512k
+ FLASH (rx) : ORIGIN = 0x10040000, LENGTH = 256k
SRAM (rwx) : ORIGIN = 0x20040000, LENGTH = 256k
SPID (r) : ORIGIN = 0x80000000, LENGTH = 512M
}
diff --git a/lib/sdk/Libraries/MAX32665PeriphDriver/Source/flc.c b/lib/sdk/Libraries/MAX32665PeriphDriver/Source/flc.c
index c99d95442..a595ad4bc 100644
--- a/lib/sdk/Libraries/MAX32665PeriphDriver/Source/flc.c
+++ b/lib/sdk/Libraries/MAX32665PeriphDriver/Source/flc.c
@@ -199,18 +199,14 @@ int FLC_PageErase(uint32_t address)
uint32_t addr;
mxc_flc_regs_t *flc = NULL;
- printf("%p\n", address);
// Get FLC Instance
if ((err = SYS_FLC_GetByAddress(&flc, address)) != E_NO_ERROR) {
- printf("A\n");
return err;
}
if ((err = SYS_FLC_GetPhysicalAddress(address, &addr)) < E_NO_ERROR) {
- printf("B\n");
return err;
}
if ((err = prepare_flc(flc)) != E_NO_ERROR) {
- printf("C\n");
return err;
}
@@ -231,7 +227,6 @@ int FLC_PageErase(uint32_t address)
/* Check access violations */
if (flc->intr & MXC_F_FLC_INTR_AF) {
flc->intr &= ~MXC_F_FLC_INTR_AF;
- printf("D\n");
return E_BAD_STATE;
}
diff --git a/openocd/scripts/target/max32665.cfg b/openocd/scripts/target/max32665.cfg
index c79eb6fc3..4ade1745d 100644
--- a/openocd/scripts/target/max32665.cfg
+++ b/openocd/scripts/target/max32665.cfg
@@ -9,10 +9,8 @@ reset_config none
# Set flash parameters
set FLASH_BASE 0x10000000
-set FLASH_BASE1 0x10080000
-set FLASH_SIZE 0x80000
+set FLASH_SIZE 0x300000
set FLC_BASE 0x40029000
-set FLC_BASE1 0x40029400
set FLASH_SECTOR 0x2000
set FLASH_CLK 96
set FLASH_OPTIONS 0x01
diff --git a/openocd/scripts/target/max32xxx.cfg b/openocd/scripts/target/max32xxx.cfg
index 21385f62c..9f5b2719e 100644
--- a/openocd/scripts/target/max32xxx.cfg
+++ b/openocd/scripts/target/max32xxx.cfg
@@ -93,8 +93,3 @@ if { [info exists FLASH_OPTIONS] } {
flash bank $_CHIPNAME.flash max32xxx $_FLASH_BASE $_FLASH_SIZE 0 0 $_CHIPNAME.cpu \
$_FLC_BASE $_FLASH_SECTOR $_FLASH_CLK $_FLASH_OPTIONS
-
-if { [info exists FLASH_BASE1] } {
- flash bank $_CHIPNAME.flash1 max32xxx $FLASH_BASE1 $_FLASH_SIZE 0 0 $_CHIPNAME.cpu \
- $FLC_BASE1 $_FLASH_SECTOR $_FLASH_CLK $_FLASH_OPTIONS
-}
diff --git a/pycardium/meson.build b/pycardium/meson.build
index 2c73fe86e..49d083c38 100644
--- a/pycardium/meson.build
+++ b/pycardium/meson.build
@@ -67,15 +67,6 @@ custom_target(
name + '.bin',
build_by_default: true,
output: name + '.bin',
- #input: [elf, 'epicardium/epicardium.bin'],
- input: [elf],
+ input: elf,
command: [build_image, '@INPUT@', '@OUTPUT0@'],
)
-
-#custom_target(
-# name + '.b1n',
-# build_by_default: true,
-# output: name + '.b1n',
-# input: bin,
-# command: [build_image, '@INPUT@', '@OUTPUT0@'],
-#)
--
GitLab