[Buildroot] [PATCH 1/3] board: add stm32f429-disc1 config

[Buildroot] [PATCH 1/3] board: add stm32f429-disc1 config

[Samuel Martin]

This change renders the stm32f429discovery a bit more generic and reuse most
of its settings for the stm32f429-disc1 board.

Cc: Waldemar Brodkorb <wbx@openadk.org>
Cc: Davide Viti <d.viti@infosolution.it>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 board/stmicroelectronics/stm32f429-disc1            |  1 +
 board/stmicroelectronics/stm32f429-disco/flash.sh   | 10 ++++++++--
 board/stmicroelectronics/stm32f429-disco/readme.txt |  7 ++++---
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 120000 board/stmicroelectronics/stm32f429-disc1

diff --git a/board/stmicroelectronics/stm32f429-disc1 b/board/stmicroelectronics/stm32f429-disc1
new file mode 120000
index 000000000..6b0439142
--- /dev/null
+++ b/board/stmicroelectronics/stm32f429-disc1
@@ -0,0 +1 @@
+stm32f429-disco
\ No newline at end of file
diff --git a/board/stmicroelectronics/stm32f429-disco/flash.sh b/board/stmicroelectronics/stm32f429-disco/flash.sh
index ffb8fcffa..74021369a 100755
--- a/board/stmicroelectronics/stm32f429-disco/flash.sh
+++ b/board/stmicroelectronics/stm32f429-disco/flash.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 
 OUTPUT_DIR=$1
+BOARD_NAME=${2:-stm32f429discovery}
 
 if ! test -d "${OUTPUT_DIR}" ; then
     echo "ERROR: no output directory specified."
-    echo "Usage: $0 OUTPUT_DIR"
+    echo "Usage: $0 OUTPUT_DIR BOARD_NAME"
+    echo ""
+    echo "Arguments:"
+    echo "    OUTPUT_DIR    The Buildroot output directory."
+    echo "    BOARD_NAME    One of the available boards among:"
+    echo "                  stm32f429discovery, stm32f429disc1"
     exit 1
 fi
 
-${OUTPUT_DIR}/host/usr/bin/openocd -f board/stm32f429discovery.cfg \
+${OUTPUT_DIR}/host/usr/bin/openocd -f board/${BOARD_NAME}.cfg \
   -c "init" \
   -c "reset init" \
   -c "flash probe 0" \
diff --git a/board/stmicroelectronics/stm32f429-disco/readme.txt b/board/stmicroelectronics/stm32f429-disco/readme.txt
index 43a25b420..a1d91d234 100644
--- a/board/stmicroelectronics/stm32f429-disco/readme.txt
+++ b/board/stmicroelectronics/stm32f429-disco/readme.txt
@@ -15,8 +15,8 @@ Wire the UART
 
 Use a USB to TTL adapter, and connect:
 
- - RX to PA9
- - TX to PA10
+ - RX to PA9 (or the RX pin on the stm32f429i-disc1 board)
+ - TX to PA10 (or the TX pin on the stm32f429i-disc1 board)
  - GND to one of the GND available on the board
 
 The UART is configured at 115200.
@@ -24,7 +24,8 @@ The UART is configured at 115200.
 Flashing
 --------
 
-  ./board/stmicroelectronics/stm32f429-disco/flash.sh output/
+  ./board/stmicroelectronics/stm32f429-disco/flash.sh output/ \
+      {stm32f429discovery|stm32f429disc1}
 
 It will flash the minimal bootloader, the Device Tree Blob, and the
 kernel image which includes the root filesystem as initramfs.
-- 
2.12.2

[Buildroot] [PATCH 2/3] linux: bump default to version 4.11

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index dc19a628f..ace007cc9 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -26,7 +26,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.10.13)"
+	bool "Latest version (4.11)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (v4.4.55-cip3)"
@@ -116,7 +116,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.10.13" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.11" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.4.55-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
-- 
2.12.2

[Buildroot] [PATCH 2/3] linux: bump default to version 4.11

[Thomas Petazzoni]

Hello,

On Mon,  1 May 2017 09:26:44 +0200, Samuel Martin wrote:
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  linux/Config.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/3] linux-header: bump default to version 4.11

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/linux-headers/Config.in.host | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 5c67626b2..b1ef3d623 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
-	default BR2_KERNEL_HEADERS_4_10
+	default BR2_KERNEL_HEADERS_4_11
 	help
 	  Select the kernel version to get headers from.
 
@@ -62,6 +62,10 @@ config BR2_KERNEL_HEADERS_4_10
 	bool "Linux 4.10.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
 
+config BR2_KERNEL_HEADERS_4_11
+	bool "Linux 4.11.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"
 
@@ -83,6 +87,10 @@ choice
 	  This is used to hide/show some packages that have strict
 	  requirements on the version of kernel headers.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11
+	bool "4.11.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10
 	bool "4.10.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
@@ -222,4 +230,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.4.64"	if BR2_KERNEL_HEADERS_4_4
 	default "4.9.25"	if BR2_KERNEL_HEADERS_4_9
 	default "4.10.13"	if BR2_KERNEL_HEADERS_4_10
+	default "4.11"		if BR2_KERNEL_HEADERS_4_11
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
-- 
2.12.2

[Buildroot] [PATCH 3/3] linux-header: bump default to version 4.11

[Thomas Petazzoni]

Hello,

On Mon,  1 May 2017 09:26:45 +0200, Samuel Martin wrote:

> +config BR2_KERNEL_HEADERS_4_11
> +	bool "Linux 4.11.x kernel headers"
> +	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11

You're selecting a symbol that does not exist. Look at
369b66fc366e3841ffb4dd2d35696f27799ae374 for the needed changes to add
a new kernel headers series.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] board: add stm32f429-disc1 config

[Thomas Petazzoni]

Hello,

On Mon,  1 May 2017 09:26:43 +0200, Samuel Martin wrote:
> This change renders the stm32f429discovery a bit more generic and reuse most
> of its settings for the stm32f429-disc1 board.
> 
> Cc: Waldemar Brodkorb <wbx@openadk.org>
> Cc: Davide Viti <d.viti@infosolution.it>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  board/stmicroelectronics/stm32f429-disc1            |  1 +
>  board/stmicroelectronics/stm32f429-disco/flash.sh   | 10 ++++++++--
>  board/stmicroelectronics/stm32f429-disco/readme.txt |  7 ++++---
>  3 files changed, 13 insertions(+), 5 deletions(-)
>  create mode 120000 board/stmicroelectronics/stm32f429-disc1

So there's no new defconfig? The existing one works fine, and the board
only differs in the wiring of the serial port and the JTAG connection ?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] board: add stm32f429-disc1 config

[Samuel Martin]

Hi all, Thomas,

On Mon, May 1, 2017 at 10:43 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Mon,  1 May 2017 09:26:43 +0200, Samuel Martin wrote:
>> This change renders the stm32f429discovery a bit more generic and reuse most
>> of its settings for the stm32f429-disc1 board.
>>
>> Cc: Waldemar Brodkorb <wbx@openadk.org>
>> Cc: Davide Viti <d.viti@infosolution.it>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  board/stmicroelectronics/stm32f429-disc1            |  1 +
>>  board/stmicroelectronics/stm32f429-disco/flash.sh   | 10 ++++++++--
>>  board/stmicroelectronics/stm32f429-disco/readme.txt |  7 ++++---
>>  3 files changed, 13 insertions(+), 5 deletions(-)
>>  create mode 120000 board/stmicroelectronics/stm32f429-disc1
>
> So there's no new defconfig? The existing one works fine, and the board
> only differs in the wiring of the serial port and the JTAG connection ?

No new defconfig (just reuse the stm32f429-disc0 ones for both kernel
and buildroot).
Between the disc0 and the disc1 version, just the debugging chip
differ (hence the new config to be used with openocd, this new config
is already available in openocd-0.10).
According to the datasheet, the serial pin should be unchanged.

Regards,

>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com


-- 
Samuel