[U-Boot] [PATCH 1/4] arm: exynos: arndale: Replace Chander Kashyap inactive maintainer

[U-Boot] [PATCH 1/4] arm: exynos: arndale: Replace Chander Kashyap inactive maintainer

[Krzysztof Kozlowski]

Last activity from Arndale (Exynos5250) board maintainer Chander Kashyap
was in January 2014 (Signed-off).  Recently his samsung.com email
bounces with 550 (5.1.1 Recipient address rejected: User unknown).

Add Krzysztof Kozlowski as odd fixer for this board.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Although I do not have this particular board, but still I can try to
take care about odd fixes.  Instead I have few other boards based on
Exynos4412 (Odroids) and 542x (Arndale Octa, Odroids).  I also run
automated Linux kernel boot tests for my boards and I maintain the
Samsung SoCs in Linux kernel.
---
 board/samsung/arndale/MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/samsung/arndale/MAINTAINERS b/board/samsung/arndale/MAINTAINERS
index 7dc17854d1b3..98ccaa42a86e 100644
--- a/board/samsung/arndale/MAINTAINERS
+++ b/board/samsung/arndale/MAINTAINERS
@@ -1,6 +1,6 @@
 ARNDALE BOARD
-M:	Chander Kashyap <k.chander@samsung.com>
-S:	Maintained
+M:	Krzysztof Kozlowski <krzk@kernel.org>
+S:	Odd Fixes
 F:	board/samsung/arndale/
 F:	include/configs/arndale.h
 F:	configs/arndale_defconfig
-- 
2.17.1

[U-Boot] [PATCH 2/4] configs: odroid_xu3: Use consistent syntax for #include

[Krzysztof Kozlowski]

When including other header from configs, use consistent <> syntax.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 include/configs/odroid_xu3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index f178549a7223..7f4cff186151 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -7,7 +7,7 @@
 #ifndef __CONFIG_ODROID_XU3_H
 #define __CONFIG_ODROID_XU3_H
 
-#include "exynos5420-common.h"
+#include <configs/exynos5420-common.h>
 #include <configs/exynos5-common.h>
 
 #define CONFIG_BOARD_COMMON
-- 
2.17.1

[U-Boot] [PATCH 3/4] configs: odroid_xu3: Unify indentation

[Krzysztof Kozlowski]

File mixed space and tab indentation.  Unify it.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 include/configs/odroid_xu3.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 7f4cff186151..5e765a2b2b02 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -18,7 +18,7 @@
 
 #define TZPC_BASE_OFFSET		0x10000
 
-#define SDRAM_BANK_SIZE		(256UL << 20UL)	/* 256 MB */
+#define SDRAM_BANK_SIZE			(256UL << 20UL)	/* 256 MB */
 /* Reserve the last 22 MiB for the secure firmware */
 #define CONFIG_SYS_MEM_TOP_HIDE		(22UL << 20UL)
 #define CONFIG_TZSW_RESERVED_DRAM_SIZE	CONFIG_SYS_MEM_TOP_HIDE
@@ -28,7 +28,7 @@
 #define CONFIG_ENV_SIZE			(SZ_1K * 16)
 #define CONFIG_ENV_OFFSET		(SZ_1K * 3136) /* ~3 MiB offset */
 
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 
@@ -38,7 +38,7 @@
 /* DFU */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_32M
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define DFU_MANIFEST_POLL_TIMEOUT       25000
+#define DFU_MANIFEST_POLL_TIMEOUT	25000
 
 /* THOR */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
@@ -85,11 +85,11 @@
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
-#define CONFIG_ODROID_REV_AIN			9
+#define CONFIG_ODROID_REV_AIN		9
 #define CONFIG_REVISION_TAG
 
 #undef CONFIG_SYS_BOARD
-#define CONFIG_SYS_BOARD	"odroid"
+#define CONFIG_SYS_BOARD		"odroid"
 
 /* Define new extra env settings, including DFU settings */
 #undef CONFIG_EXTRA_ENV_SETTINGS
-- 
2.17.1

[U-Boot] [PATCH 4/4] arm: exynos: Remove duplicated "boardname" env setting

[Krzysztof Kozlowski]

Various places in the code set "boardname" env property.  It was used
for booting from ITB images and choosing proper DTB file name.  Instead
of duplicating it, use existing U-Boot wide - "board_name".

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Tested only on Odroid XU3.
Tests on other boards appreciated.
---
 board/samsung/common/bootscripts/autoboot.cmd | 10 +++++-----
 board/samsung/common/misc.c                   |  2 +-
 include/configs/odroid.h                      |  2 +-
 include/configs/odroid_xu3.h                  |  8 ++++++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/board/samsung/common/bootscripts/autoboot.cmd b/board/samsung/common/bootscripts/autoboot.cmd
index 11c724c4e095..d66bcccf5d1c 100644
--- a/board/samsung/common/bootscripts/autoboot.cmd
+++ b/board/samsung/common/bootscripts/autoboot.cmd
@@ -3,7 +3,7 @@
 # ./tools/mkimage -c none -A arm -T script -d autoboot.cmd boot.scr
 #
 # It requires a list of environment variables to be defined before load:
-# platform dependent: boardname, fdtfile, console
+# platform dependent: board_name, fdtfile, console
 # system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype
 #
 setenv fdtaddr     "40800000"
@@ -35,17 +35,17 @@ else
 	setenv initrd_addr -;
 fi;"
 
-#### Routine: boot_fit - check that env $boardname is set and boot proper config of ITB image
+#### Routine: boot_fit - check that env $board_name is set and boot proper config of ITB image
 setenv setboot_fit "
-if test -e '${boardname}'; then
+if test -e '${board_name}'; then
 	setenv fdt_addr ;
 	setenv initrd_addr ;
 	setenv kerneladdr  0x42000000;
 	setenv kernelname  Image.itb;
-	setenv itbcfg      "\"#${boardname}\"";
+	setenv itbcfg      "\"#${board_name}\"";
 	setenv imgbootcmd  bootm;
 else
-	echo Warning! Variable: \$boardname is undefined!;
+	echo Warning! Variable: \$board_name is undefined!;
 fi"
 
 #### Routine: setboot_uimg - prepare env to boot uImage
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 05243fc89659..53cd1b290703 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -101,7 +101,7 @@ void set_board_info(void)
 		bdtype = "";
 
 	sprintf(info, "%s%s", bdname, bdtype);
-	env_set("boardname", info);
+	env_set("board_name", info);
 #endif
 	snprintf(info, ARRAY_SIZE(info),  "%s%x-%s%s.dtb",
 		 CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype);
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index b8809c8dcc7c..9f2d43e3fa38 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -132,7 +132,7 @@
 		"setenv kernelname Image.itb;" \
 		"run loadkernel;" \
 		"run kernel_args;" \
-		"bootm ${kernel_addr_r}#${boardname}\0" \
+		"bootm ${kernel_addr_r}#${board_name}\0" \
 	"boot_uimg=" \
 		"setenv kernelname uImage;" \
 		"run check_dtb;" \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 5e765a2b2b02..af6004eaf511 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -84,10 +84,14 @@
 #define CONFIG_SET_DFU_ALT_INFO
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
-/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
+/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
 #define CONFIG_ODROID_REV_AIN		9
 #define CONFIG_REVISION_TAG
 
+/*
+ * Need to override existing one (smdk5420) with odroid so set_board_info will
+ * use proper prefix when creating full board_name (SYS_BOARD + type)
+ */
 #undef CONFIG_SYS_BOARD
 #define CONFIG_SYS_BOARD		"odroid"
 
@@ -101,7 +105,7 @@
 	"rootfstype=ext4\0" \
 	"console=" CONFIG_DEFAULT_CONSOLE \
 	"fdtfile=exynos5422-odroidxu3.dtb\0" \
-	"boardname=odroidxu3\0" \
+	"board_name=odroidxu3\0" \
 	"mmcbootdev=0\0" \
 	"mmcrootdev=0\0" \
 	"mmcbootpart=1\0" \
-- 
2.17.1

[U-Boot] [PATCH 1/4] arm: exynos: arndale: Replace Chander Kashyap inactive maintainer

[Lukasz Majewski]

On Fri, 22 Feb 2019 19:36:40 +0100
Krzysztof Kozlowski <krzk@kernel.org> wrote:

> Last activity from Arndale (Exynos5250) board maintainer Chander
> Kashyap was in January 2014 (Signed-off).  Recently his samsung.com
> email bounces with 550 (5.1.1 Recipient address rejected: User
> unknown).
> 
> Add Krzysztof Kozlowski as odd fixer for this board.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---
> 
> Although I do not have this particular board, but still I can try to
> take care about odd fixes.  Instead I have few other boards based on
> Exynos4412 (Odroids) and 542x (Arndale Octa, Odroids).  I also run
> automated Linux kernel boot tests for my boards and I maintain the
> Samsung SoCs in Linux kernel.
> ---
>  board/samsung/arndale/MAINTAINERS | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/board/samsung/arndale/MAINTAINERS
> b/board/samsung/arndale/MAINTAINERS index 7dc17854d1b3..98ccaa42a86e
> 100644 --- a/board/samsung/arndale/MAINTAINERS
> +++ b/board/samsung/arndale/MAINTAINERS
> @@ -1,6 +1,6 @@
>  ARNDALE BOARD
> -M:	Chander Kashyap <k.chander@samsung.com>
> -S:	Maintained
> +M:	Krzysztof Kozlowski <krzk@kernel.org>
> +S:	Odd Fixes
>  F:	board/samsung/arndale/
>  F:	include/configs/arndale.h
>  F:	configs/arndale_defconfig

(Fully) Acked-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190222/c91c78e0/attachment.sig>

[U-Boot] [PATCH 2/4] configs: odroid_xu3: Use consistent syntax for #include

[Lukasz Majewski]

On Fri, 22 Feb 2019 19:36:41 +0100
Krzysztof Kozlowski <krzk@kernel.org> wrote:

> When including other header from configs, use consistent <> syntax.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
>  include/configs/odroid_xu3.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/odroid_xu3.h
> b/include/configs/odroid_xu3.h index f178549a7223..7f4cff186151 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -7,7 +7,7 @@
>  #ifndef __CONFIG_ODROID_XU3_H
>  #define __CONFIG_ODROID_XU3_H
>  
> -#include "exynos5420-common.h"
> +#include <configs/exynos5420-common.h>
>  #include <configs/exynos5-common.h>
>  
>  #define CONFIG_BOARD_COMMON

Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190224/b2c25ec0/attachment.sig>

[U-Boot] [PATCH 3/4] configs: odroid_xu3: Unify indentation

[Lukasz Majewski]

On Fri, 22 Feb 2019 19:36:42 +0100
Krzysztof Kozlowski <krzk@kernel.org> wrote:

> File mixed space and tab indentation.  Unify it.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
>  include/configs/odroid_xu3.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/configs/odroid_xu3.h
> b/include/configs/odroid_xu3.h index 7f4cff186151..5e765a2b2b02 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -18,7 +18,7 @@
>  
>  #define TZPC_BASE_OFFSET		0x10000
>  
> -#define SDRAM_BANK_SIZE		(256UL << 20UL)	/* 256
> MB */ +#define SDRAM_BANK_SIZE			(256UL <<
> 20UL)	/* 256 MB */ /* Reserve the last 22 MiB for the secure
> firmware */ #define CONFIG_SYS_MEM_TOP_HIDE		(22UL <<
> 20UL) #define CONFIG_TZSW_RESERVED_DRAM_SIZE
> CONFIG_SYS_MEM_TOP_HIDE @@ -28,7 +28,7 @@
>  #define CONFIG_ENV_SIZE			(SZ_1K * 16)
>  #define CONFIG_ENV_OFFSET		(SZ_1K * 3136) /* ~3 MiB
> offset */ 
> -#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR -
> 0x1000000) +#define CONFIG_SYS_INIT_SP_ADDR
> (CONFIG_SYS_LOAD_ADDR - 0x1000000) 
>  #define
> CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0" 
> @@ -38,7 +38,7 @@
>  /* DFU */
>  #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_32M
>  #define DFU_DEFAULT_POLL_TIMEOUT	300
> -#define DFU_MANIFEST_POLL_TIMEOUT       25000
> +#define DFU_MANIFEST_POLL_TIMEOUT	25000
>  
>  /* THOR */
>  #define CONFIG_G_DNL_THOR_VENDOR_NUM
> CONFIG_USB_GADGET_VENDOR_NUM @@ -85,11 +85,11 @@
>  #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
>  
>  /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
> -#define CONFIG_ODROID_REV_AIN			9
> +#define CONFIG_ODROID_REV_AIN		9
>  #define CONFIG_REVISION_TAG
>  
>  #undef CONFIG_SYS_BOARD
> -#define CONFIG_SYS_BOARD	"odroid"
> +#define CONFIG_SYS_BOARD		"odroid"
>  
>  /* Define new extra env settings, including DFU settings */
>  #undef CONFIG_EXTRA_ENV_SETTINGS

Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190224/9ec38892/attachment.sig>

[U-Boot] [PATCH 4/4] arm: exynos: Remove duplicated "boardname" env setting

[Lukasz Majewski]

On Fri, 22 Feb 2019 19:36:43 +0100
Krzysztof Kozlowski <krzk@kernel.org> wrote:

> Various places in the code set "boardname" env property.  It was used
> for booting from ITB images and choosing proper DTB file name.
> Instead of duplicating it, use existing U-Boot wide - "board_name".
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---
> 
> Tested only on Odroid XU3.
> Tests on other boards appreciated.
> ---
>  board/samsung/common/bootscripts/autoboot.cmd | 10 +++++-----
>  board/samsung/common/misc.c                   |  2 +-
>  include/configs/odroid.h                      |  2 +-
>  include/configs/odroid_xu3.h                  |  8 ++++++--
>  4 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/board/samsung/common/bootscripts/autoboot.cmd
> b/board/samsung/common/bootscripts/autoboot.cmd index
> 11c724c4e095..d66bcccf5d1c 100644 ---
> a/board/samsung/common/bootscripts/autoboot.cmd +++
> b/board/samsung/common/bootscripts/autoboot.cmd @@ -3,7 +3,7 @@
>  # ./tools/mkimage -c none -A arm -T script -d autoboot.cmd boot.scr
>  #
>  # It requires a list of environment variables to be defined before
> load: -# platform dependent: boardname, fdtfile, console
> +# platform dependent: board_name, fdtfile, console
>  # system dependent: mmcbootdev, mmcbootpart, mmcrootdev,
> mmcrootpart, rootfstype #
>  setenv fdtaddr     "40800000"
> @@ -35,17 +35,17 @@ else
>  	setenv initrd_addr -;
>  fi;"
>  
> -#### Routine: boot_fit - check that env $boardname is set and boot
> proper config of ITB image +#### Routine: boot_fit - check that env
> $board_name is set and boot proper config of ITB image setenv
> setboot_fit " -if test -e '${boardname}'; then
> +if test -e '${board_name}'; then
>  	setenv fdt_addr ;
>  	setenv initrd_addr ;
>  	setenv kerneladdr  0x42000000;
>  	setenv kernelname  Image.itb;
> -	setenv itbcfg      "\"#${boardname}\"";
> +	setenv itbcfg      "\"#${board_name}\"";
>  	setenv imgbootcmd  bootm;
>  else
> -	echo Warning! Variable: \$boardname is undefined!;
> +	echo Warning! Variable: \$board_name is undefined!;
>  fi"
>  
>  #### Routine: setboot_uimg - prepare env to boot uImage
> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
> index 05243fc89659..53cd1b290703 100644
> --- a/board/samsung/common/misc.c
> +++ b/board/samsung/common/misc.c
> @@ -101,7 +101,7 @@ void set_board_info(void)
>  		bdtype = "";
>  
>  	sprintf(info, "%s%s", bdname, bdtype);
> -	env_set("boardname", info);
> +	env_set("board_name", info);
>  #endif
>  	snprintf(info, ARRAY_SIZE(info),  "%s%x-%s%s.dtb",
>  		 CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype);
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index b8809c8dcc7c..9f2d43e3fa38 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -132,7 +132,7 @@
>  		"setenv kernelname Image.itb;" \
>  		"run loadkernel;" \
>  		"run kernel_args;" \
> -		"bootm ${kernel_addr_r}#${boardname}\0" \
> +		"bootm ${kernel_addr_r}#${board_name}\0" \
>  	"boot_uimg=" \
>  		"setenv kernelname uImage;" \
>  		"run check_dtb;" \
> diff --git a/include/configs/odroid_xu3.h
> b/include/configs/odroid_xu3.h index 5e765a2b2b02..af6004eaf511 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -84,10 +84,14 @@
>  #define CONFIG_SET_DFU_ALT_INFO
>  #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
>  
> -/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
> +/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
>  #define CONFIG_ODROID_REV_AIN		9
>  #define CONFIG_REVISION_TAG
>  
> +/*
> + * Need to override existing one (smdk5420) with odroid so
> set_board_info will
> + * use proper prefix when creating full board_name (SYS_BOARD + type)
> + */
>  #undef CONFIG_SYS_BOARD
>  #define CONFIG_SYS_BOARD		"odroid"
>  
> @@ -101,7 +105,7 @@
>  	"rootfstype=ext4\0" \
>  	"console=" CONFIG_DEFAULT_CONSOLE \
>  	"fdtfile=exynos5422-odroidxu3.dtb\0" \
> -	"boardname=odroidxu3\0" \
> +	"board_name=odroidxu3\0" \
>  	"mmcbootdev=0\0" \
>  	"mmcrootdev=0\0" \
>  	"mmcbootpart=1\0" \

Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190224/9f02deed/attachment.sig>

[U-Boot] [PATCH 4/4] arm: exynos: Remove duplicated "boardname" env setting

[Minkyu Kang]

On 23/02/2019 03:36, Krzysztof Kozlowski wrote:
> Various places in the code set "boardname" env property.  It was used
> for booting from ITB images and choosing proper DTB file name.  Instead
> of duplicating it, use existing U-Boot wide - "board_name".
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---
> 
> Tested only on Odroid XU3.
> Tests on other boards appreciated.
> ---
>  board/samsung/common/bootscripts/autoboot.cmd | 10 +++++-----
>  board/samsung/common/misc.c                   |  2 +-
>  include/configs/odroid.h                      |  2 +-
>  include/configs/odroid_xu3.h                  |  8 ++++++--
>  4 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/board/samsung/common/bootscripts/autoboot.cmd b/board/samsung/common/bootscripts/autoboot.cmd
> index 11c724c4e095..d66bcccf5d1c 100644
> --- a/board/samsung/common/bootscripts/autoboot.cmd
> +++ b/board/samsung/common/bootscripts/autoboot.cmd
> @@ -3,7 +3,7 @@
>  # ./tools/mkimage -c none -A arm -T script -d autoboot.cmd boot.scr
>  #
>  # It requires a list of environment variables to be defined before load:
> -# platform dependent: boardname, fdtfile, console
> +# platform dependent: board_name, fdtfile, console
>  # system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype
>  #
>  setenv fdtaddr     "40800000"
> @@ -35,17 +35,17 @@ else
>  	setenv initrd_addr -;
>  fi;"
>  
> -#### Routine: boot_fit - check that env $boardname is set and boot proper config of ITB image
> +#### Routine: boot_fit - check that env $board_name is set and boot proper config of ITB image
>  setenv setboot_fit "
> -if test -e '${boardname}'; then
> +if test -e '${board_name}'; then
>  	setenv fdt_addr ;
>  	setenv initrd_addr ;
>  	setenv kerneladdr  0x42000000;
>  	setenv kernelname  Image.itb;
> -	setenv itbcfg      "\"#${boardname}\"";
> +	setenv itbcfg      "\"#${board_name}\"";
>  	setenv imgbootcmd  bootm;
>  else
> -	echo Warning! Variable: \$boardname is undefined!;
> +	echo Warning! Variable: \$board_name is undefined!;
>  fi"
>  
>  #### Routine: setboot_uimg - prepare env to boot uImage
> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
> index 05243fc89659..53cd1b290703 100644
> --- a/board/samsung/common/misc.c
> +++ b/board/samsung/common/misc.c
> @@ -101,7 +101,7 @@ void set_board_info(void)
>  		bdtype = "";
>  
>  	sprintf(info, "%s%s", bdname, bdtype);
> -	env_set("boardname", info);
> +	env_set("board_name", info);
>  #endif
>  	snprintf(info, ARRAY_SIZE(info),  "%s%x-%s%s.dtb",
>  		 CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype);
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index b8809c8dcc7c..9f2d43e3fa38 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -132,7 +132,7 @@
>  		"setenv kernelname Image.itb;" \
>  		"run loadkernel;" \
>  		"run kernel_args;" \
> -		"bootm ${kernel_addr_r}#${boardname}\0" \
> +		"bootm ${kernel_addr_r}#${board_name}\0" \
>  	"boot_uimg=" \
>  		"setenv kernelname uImage;" \
>  		"run check_dtb;" \
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index 5e765a2b2b02..af6004eaf511 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -84,10 +84,14 @@
>  #define CONFIG_SET_DFU_ALT_INFO
>  #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
>  
> -/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
> +/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
>  #define CONFIG_ODROID_REV_AIN		9
>  #define CONFIG_REVISION_TAG
>  
> +/*
> + * Need to override existing one (smdk5420) with odroid so set_board_info will
> + * use proper prefix when creating full board_name (SYS_BOARD + type)
> + */
>  #undef CONFIG_SYS_BOARD
>  #define CONFIG_SYS_BOARD		"odroid"
>  
> @@ -101,7 +105,7 @@
>  	"rootfstype=ext4\0" \
>  	"console=" CONFIG_DEFAULT_CONSOLE \
>  	"fdtfile=exynos5422-odroidxu3.dtb\0" \
> -	"boardname=odroidxu3\0" \
> +	"board_name=odroidxu3\0" \
>  	"mmcbootdev=0\0" \
>  	"mmcrootdev=0\0" \
>  	"mmcbootpart=1\0" \
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

[U-Boot] [PATCH 3/4] configs: odroid_xu3: Unify indentation

[Minkyu Kang]

On 23/02/2019 03:36, Krzysztof Kozlowski wrote:
> File mixed space and tab indentation.  Unify it.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
>  include/configs/odroid_xu3.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index 7f4cff186151..5e765a2b2b02 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -18,7 +18,7 @@
>  
>  #define TZPC_BASE_OFFSET		0x10000
>  
> -#define SDRAM_BANK_SIZE		(256UL << 20UL)	/* 256 MB */
> +#define SDRAM_BANK_SIZE			(256UL << 20UL)	/* 256 MB */
>  /* Reserve the last 22 MiB for the secure firmware */
>  #define CONFIG_SYS_MEM_TOP_HIDE		(22UL << 20UL)
>  #define CONFIG_TZSW_RESERVED_DRAM_SIZE	CONFIG_SYS_MEM_TOP_HIDE
> @@ -28,7 +28,7 @@
>  #define CONFIG_ENV_SIZE			(SZ_1K * 16)
>  #define CONFIG_ENV_OFFSET		(SZ_1K * 3136) /* ~3 MiB offset */
>  
> -#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
> +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_LOAD_ADDR - 0x1000000)
>  
>  #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
>  
> @@ -38,7 +38,7 @@
>  /* DFU */
>  #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_32M
>  #define DFU_DEFAULT_POLL_TIMEOUT	300
> -#define DFU_MANIFEST_POLL_TIMEOUT       25000
> +#define DFU_MANIFEST_POLL_TIMEOUT	25000
>  
>  /* THOR */
>  #define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
> @@ -85,11 +85,11 @@
>  #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
>  
>  /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
> -#define CONFIG_ODROID_REV_AIN			9
> +#define CONFIG_ODROID_REV_AIN		9
>  #define CONFIG_REVISION_TAG
>  
>  #undef CONFIG_SYS_BOARD
> -#define CONFIG_SYS_BOARD	"odroid"
> +#define CONFIG_SYS_BOARD		"odroid"
>  
>  /* Define new extra env settings, including DFU settings */
>  #undef CONFIG_EXTRA_ENV_SETTINGS
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

[U-Boot] [PATCH 2/4] configs: odroid_xu3: Use consistent syntax for #include

[Minkyu Kang]

On 23/02/2019 03:36, Krzysztof Kozlowski wrote:
> When including other header from configs, use consistent <> syntax.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
>  include/configs/odroid_xu3.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index f178549a7223..7f4cff186151 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -7,7 +7,7 @@
>  #ifndef __CONFIG_ODROID_XU3_H
>  #define __CONFIG_ODROID_XU3_H
>  
> -#include "exynos5420-common.h"
> +#include <configs/exynos5420-common.h>
>  #include <configs/exynos5-common.h>
>  
>  #define CONFIG_BOARD_COMMON
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

[U-Boot] [PATCH 1/4] arm: exynos: arndale: Replace Chander Kashyap inactive maintainer

[Minkyu Kang]

On 23/02/2019 03:36, Krzysztof Kozlowski wrote:
> Last activity from Arndale (Exynos5250) board maintainer Chander Kashyap
> was in January 2014 (Signed-off).  Recently his samsung.com email
> bounces with 550 (5.1.1 Recipient address rejected: User unknown).
> 
> Add Krzysztof Kozlowski as odd fixer for this board.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---
> 
> Although I do not have this particular board, but still I can try to
> take care about odd fixes.  Instead I have few other boards based on
> Exynos4412 (Odroids) and 542x (Arndale Octa, Odroids).  I also run
> automated Linux kernel boot tests for my boards and I maintain the
> Samsung SoCs in Linux kernel.
> ---
>  board/samsung/arndale/MAINTAINERS | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/board/samsung/arndale/MAINTAINERS b/board/samsung/arndale/MAINTAINERS
> index 7dc17854d1b3..98ccaa42a86e 100644
> --- a/board/samsung/arndale/MAINTAINERS
> +++ b/board/samsung/arndale/MAINTAINERS
> @@ -1,6 +1,6 @@
>  ARNDALE BOARD
> -M:	Chander Kashyap <k.chander@samsung.com>
> -S:	Maintained
> +M:	Krzysztof Kozlowski <krzk@kernel.org>
> +S:	Odd Fixes
>  F:	board/samsung/arndale/
>  F:	include/configs/arndale.h
>  F:	configs/arndale_defconfig
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.