Prepare U-Boot for more Amlogic boards

PATCH Superseded Carlo Caione 3 participants 9 messages Jun 10, 2016 – Jun 25, 2016

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Amlogic Meson SoC support

lore

Share & tools

lore

Carlo Caione

author

2016-06-10 18:18 UTC #0 lore raw

v2 cover Prepare U-Boot for more Amlogic boards

From: Carlo Caione <[email protected]>

Refactor the Odroid-C2 support code to prepare U-Boot for more Amlogic board submissions.
The goal is to reduce the redundancy of the configuration files and unify all the board support files onto a single amlogic directory.

Changelog:
v2:
- Added Reviewed-by
- Now 2/2 clearly shows the renaming

Carlo Caione (2):
configs: gxbb: Introduce a common config header file
board: amlogic: Rename folder for Amlogic boards

 arch/arm/mach-meson/Kconfig                        |  2 +-
 board/{hardkernel => amlogic}/odroid-c2/Kconfig    |  2 +-
 .../{hardkernel => amlogic}/odroid-c2/MAINTAINERS  |  2 +-
 board/{hardkernel => amlogic}/odroid-c2/Makefile   |  0
 board/{hardkernel => amlogic}/odroid-c2/README     |  0
 .../{hardkernel => amlogic}/odroid-c2/odroid-c2.c  |  0
 include/configs/meson-gxbb-common.h                | 45 ++++++++++++++++++++++
 include/configs/odroid-c2.h                        | 34 +---------------
 8 files changed, 49 insertions(+), 36 deletions(-)
 rename board/{hardkernel => amlogic}/odroid-c2/Kconfig (85%)
 rename board/{hardkernel => amlogic}/odroid-c2/MAINTAINERS (80%)
 rename board/{hardkernel => amlogic}/odroid-c2/Makefile (100%)
 rename board/{hardkernel => amlogic}/odroid-c2/README (100%)
 rename board/{hardkernel => amlogic}/odroid-c2/odroid-c2.c (100%)
 create mode 100644 include/configs/meson-gxbb-common.h

Signature · 1 line

2.7.4

Carlo Caione

author

2016-06-10 18:18 UTC #1 lore raw

PATCH v2 1/2 configs: gxbb: Introduce a common config header file

From: Carlo Caione <[email protected]>

Introduce a meson-gxbb-common.h header file and derive the configuration for Hardkernel Odroid-C2 board from that.

Reviewed-by Simon Glass <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

---
 include/configs/meson-gxbb-common.h | 45 +++++++++++++++++++++++++++++++++++++
 include/configs/odroid-c2.h         | 34 +---------------------------
 2 files changed, 46 insertions(+), 33 deletions(-)
 create mode 100644 include/configs/meson-gxbb-common.h

include/configs/meson-gxbb-common.h new file +45 -0

new file mode 100644
index 0000000..d1c0050
@@ -0,0 +1,45 @@
+/*
+ * Configuration for Amlogic Meson GXBB SoCs
+ * (C) Copyright 2016 Beniamino Galvani <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __MESON_GXBB_COMMON_CONFIG_H
+#define __MESON_GXBB_COMMON_CONFIG_H
+
+#define CONFIG_CPU_ARMV8
+#define CONFIG_REMAKE_ELF
+#define CONFIG_SYS_CACHELINE_SIZE	64
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_ENV_IS_NOWHERE		1
+#define CONFIG_ENV_SIZE			0x2000
+#define CONFIG_SYS_MAXARGS		32
+#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
+#define CONFIG_SYS_CBSIZE		1024
+#define CONFIG_MISC_INIT_R
+
+#define CONFIG_SYS_SDRAM_BASE		0
+#define CONFIG_SYS_TEXT_BASE		0x01000000
+#define CONFIG_SYS_INIT_SP_ADDR		0x20000000
+#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_TEXT_BASE
+
+/* Generic Interrupt Controller Definitions */
+#define GICD_BASE			0xc4301000
+#define GICC_BASE			0xc4302000
+
+#define CONFIG_CMD_ENV
+
+/* Monitor Command Prompt */
+/* Console I/O Buffer Size */
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
+					sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_CMDLINE_EDITING
+
+#include <config_distro_defaults.h>
+
+#endif /* __MESON_GXBB_COMMON_CONFIG_H */

include/configs/odroid-c2.h +1 ~~-33~~

index 37a5671..bf5df9c 100644
@@ -8,44 +8,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_CPU_ARMV8
-#define CONFIG_REMAKE_ELF
-#define CONFIG_SYS_CACHELINE_SIZE	64
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_ENV_IS_NOWHERE		1
-#define CONFIG_ENV_SIZE			0x2000
-#define CONFIG_SYS_MAXARGS		32
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
-#define CONFIG_SYS_CBSIZE		1024
-#define CONFIG_MISC_INIT_R
-
-#define CONFIG_SYS_SDRAM_BASE		0
-#define CONFIG_SYS_TEXT_BASE		0x01000000
-#define CONFIG_SYS_INIT_SP_ADDR		0x20000000
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_TEXT_BASE
-
-/* Generic Interrupt Controller Definitions */
-#define GICD_BASE			0xc4301000
-#define GICC_BASE			0xc4302000
-
 #define CONFIG_IDENT_STRING		" odroid-c2"
 
 /* Serial setup */
 #define CONFIG_CONS_INDEX		0
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_CMD_ENV
-
-/* Monitor Command Prompt */
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-
-#include <config_distro_defaults.h>
+#include <configs/meson-gxbb-common.h>
 
 #endif /* __CONFIG_H */

Signature · 1 line

2.7.4

Beniamino Galvani

2016-06-12 21:03 UTC #2 lore raw

PATCH v2 1/2 configs: gxbb: Introduce a common config header file

Quoted 4 lines · Carlo Caione

From: Carlo Caione <[email protected]>
Introduce a meson-gxbb-common.h header file and derive the configuration for Hardkernel Odroid-C2 board from that.

Acked-by Beniamino Galvani <[email protected]>

Tom Rini

2016-06-25 02:51 UTC #3 lore raw

PATCH v2 1/2 configs: gxbb: Introduce a common config header file

In reply to Carlo Caione

Quoted 8 lines · Carlo Caione

From: Carlo Caione <[email protected]>
Introduce a meson-gxbb-common.h header file and derive the configuration for Hardkernel Odroid-C2 board from that.
Reviewed-by Simon Glass <[email protected]>
Signed-off-by Carlo Caione <[email protected]>
Acked-by Beniamino Galvani <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20160624/1ee986e7/attachment.sig>

Carlo Caione

author

2016-06-10 18:18 UTC #4 lore raw

PATCH v2 2/2 board: amlogic: Rename folder for Amlogic boards

In reply to Carlo Caione

From: Carlo Caione <[email protected]>

s/hardkernel/amlogic/ to have a single place for all the amlogic-based boards.

Reviewed-by Simon Glass <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

---
 arch/arm/mach-meson/Kconfig                         | 2 +-
 board/{hardkernel => amlogic}/odroid-c2/Kconfig     | 2 +-
 board/{hardkernel => amlogic}/odroid-c2/MAINTAINERS | 2 +-
 board/{hardkernel => amlogic}/odroid-c2/Makefile    | 0
 board/{hardkernel => amlogic}/odroid-c2/README      | 0
 board/{hardkernel => amlogic}/odroid-c2/odroid-c2.c | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename board/{hardkernel => amlogic}/odroid-c2/Kconfig (85%)
 rename board/{hardkernel => amlogic}/odroid-c2/MAINTAINERS (80%)
 rename board/{hardkernel => amlogic}/odroid-c2/Makefile (100%)
 rename board/{hardkernel => amlogic}/odroid-c2/README (100%)
 rename board/{hardkernel => amlogic}/odroid-c2/odroid-c2.c (100%)

arch/arm/mach-meson/Kconfig +1 -1

index 77d3cfe..af3be59 100644
@@ -26,6 +26,6 @@ config SYS_SOC
 config SYS_MALLOC_F_LEN
 	default 0x1000
 
-source "board/hardkernel/odroid-c2/Kconfig"
+source "board/amlogic/odroid-c2/Kconfig"
 
 endif

board/amlogic/odroid-c2/Kconfig renamed from board/hardkernel/odroid-c2/Kconfig +1 -1

similarity index 85%
rename from board/hardkernel/odroid-c2/Kconfig
rename to board/amlogic/odroid-c2/Kconfig
index 687d9c6..2b16889 100644
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "odroid-c2"
 
 config SYS_VENDOR
-	default "hardkernel"
+	default "amlogic"
 
 config SYS_CONFIG_NAME
 	default "odroid-c2"

board/amlogic/odroid-c2/MAINTAINERS renamed from board/hardkernel/odroid-c2/MAINTAINERS +1 -1

similarity index 80%
rename from board/hardkernel/odroid-c2/MAINTAINERS
rename to board/amlogic/odroid-c2/MAINTAINERS
index 23ae1e7..699850f 100644
@@ -1,6 +1,6 @@
 ODROID-C2
 M:	Beniamino Galvani <[email protected]>
 S:	Maintained
-F:	board/hardkernel/odroid-c2/
+F:	board/amlogic/odroid-c2/
 F:	include/configs/odroid-c2.h
 F:	configs/odroid-c2_defconfig

board/amlogic/odroid-c2/Makefile renamed from board/hardkernel/odroid-c2/Makefile +0 -0

similarity index 100%
rename from board/hardkernel/odroid-c2/Makefile
rename to board/amlogic/odroid-c2/Makefile

board/amlogic/odroid-c2/README renamed from board/hardkernel/odroid-c2/README +0 -0

similarity index 100%
rename from board/hardkernel/odroid-c2/README
rename to board/amlogic/odroid-c2/README

board/amlogic/odroid-c2/odroid-c2.c renamed from board/hardkernel/odroid-c2/odroid-c2.c +0 -0

similarity index 100%
rename from board/hardkernel/odroid-c2/odroid-c2.c
rename to board/amlogic/odroid-c2/odroid-c2.c

Signature · 1 line

2.7.4

Beniamino Galvani

2016-06-12 21:05 UTC #5 lore raw

PATCH v2 2/2 board: amlogic: Rename folder for Amlogic boards

Quoted 4 lines · Carlo Caione

From: Carlo Caione <[email protected]>
s/hardkernel/amlogic/ to have a single place for all the amlogic-based boards.

Makes sense.

Acked-by Beniamino Galvani <[email protected]>

Tom Rini

2016-06-25 02:52 UTC #6 lore raw

PATCH v2 2/2 board: amlogic: Rename folder for Amlogic boards

In reply to Carlo Caione

Quoted 8 lines · Carlo Caione

From: Carlo Caione <[email protected]>
s/hardkernel/amlogic/ to have a single place for all the amlogic-based boards.
Reviewed-by Simon Glass <[email protected]>
Signed-off-by Carlo Caione <[email protected]>
Acked-by Beniamino Galvani <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20160624/95c5d435/attachment.sig>

Carlo Caione

author

2016-06-24 21:01 UTC #7 lore raw

v2 cover Prepare U-Boot for more Amlogic boards

In reply to Carlo Caione

Quoted 11 lines · Carlo Caione

From: Carlo Caione <[email protected]>
Refactor the Odroid-C2 support code to prepare U-Boot for more Amlogic board submissions.
The goal is to reduce the redundancy of the configuration files and unify all the board support files onto a single amlogic directory.
Changelog:
v2:
- Added Reviewed-by
- Now 2/2 clearly shows the renaming

What's left for this patchset? I have a couple of submissions depending on this one.

Signature · 1 line

Carlo Caione

Tom Rini

2016-06-24 21:11 UTC #8 lore raw

v2 cover Prepare U-Boot for more Amlogic boards

Quoted 8 lines · Carlo Caione

Quoted 7 lines · Carlo Caione
From: Carlo Caione <[email protected]>
Refactor the Odroid-C2 support code to prepare U-Boot for more Amlogic board submissions.
The goal is to reduce the redundancy of the configuration files and unify all the board support files onto a single amlogic directory.

Quoted 7 lines

Quoted 4 lines
Changelog:
v2:
- Added Reviewed-by
- Now 2/2 clearly shows the renaming
What's left for this patchset? I have a couple of submissions depending on this one.

Sorry for the delay, working on this shortly.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20160624/71992a29/attachment.sig>