diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-05-07 13:56:00 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-05-07 13:56:00 +0200 |
commit | c383e8fc8be95deb16032fecd1de00792e2cddb0 (patch) | |
tree | 327499de5317c60239289cc3549e28a20ee55260 /board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch | |
parent | a4b8342bbe4761b5e9e5306ff549f0ca8bc166bb (diff) | |
download | buildroot-c383e8fc8be95deb16032fecd1de00792e2cddb0.tar.gz buildroot-c383e8fc8be95deb16032fecd1de00792e2cddb0.zip |
board/stmicroelectronics/stm32f469-disco: remove OpenOCD patches
Since the bump of OpenOCD from 0.9.0 to 0.10.0 in commit
3b6c74d708252a32fe172be944951396d419ba88, stm32f469_disco_defconfig
fails to build:
- 0001-add-config.patch was merged in upstream OpenOCD (commit
26045588f462476cee356d15a24944d6c26befb4).
- 0002-flash-nor.patch was merged in upstream OpenOCD (commit
3e219648c80a27f0519003f3b088cbb846e255d8)
Therefore, this commit removes the two patches that are no longer
necessary.
Fixes:
https://gitlab.com/buildroot.org/buildroot/builds/15762279
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch')
-rw-r--r-- | board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch b/board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch deleted file mode 100644 index bfec98327c..0000000000 --- a/board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3e219648c80a27f0519003f3b088cbb846e255d8 Mon Sep 17 00:00:00 2001 -From: Maxime Coquelin <maxime.coquelin@st.com> -Date: Sat, 24 Oct 2015 00:03:54 +0200 -Subject: [PATCH] flash/nor/stm32f2x: Add STM32F469 part - -Change-Id: I4e13ceb0ba954dc2fea059ddeef10109be938c9c -Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com> -Reviewed-on: http://openocd.zylin.com/3042 -Tested-by: jenkins -Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com> ---- - src/flash/nor/stm32f2x.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c -index 2130444..89fc75d 100644 ---- a/src/flash/nor/stm32f2x.c -+++ b/src/flash/nor/stm32f2x.c -@@ -790,6 +790,7 @@ static int stm32x_probe(struct flash_bank *bank) - max_flash_size_in_kb = 1024; - break; - case 0x419: -+ case 0x434: - max_flash_size_in_kb = 2048; - break; - case 0x423: -@@ -952,6 +953,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size) - - case 0x413: - case 0x419: -+ case 0x434: - device_str = "STM32F4xx"; - - switch (rev_id) { --- -1.9.1 - |