[U-Boot] [PATCH v2 0/2] Prepare U-Boot for more Amlogic boards
From: Carlo Caione carlo@endlessm.com
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
From: Carlo Caione carlo@endlessm.com
Introduce a meson-gxbb-common.h header file and derive the configuration for Hardkernel Odroid-C2 board from that.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Carlo Caione carlo@endlessm.com --- 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
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h new file mode 100644 index 0000000..d1c0050 --- /dev/null +++ b/include/configs/meson-gxbb-common.h @@ -0,0 +1,45 @@ +/* + * Configuration for Amlogic Meson GXBB SoCs + * (C) Copyright 2016 Beniamino Galvani b.galvani@gmail.com + * + * 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 */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 37a5671..bf5df9c 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -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 */
On Fri, Jun 10, 2016 at 08:18:22PM +0200, Carlo Caione wrote:
From: Carlo Caione carlo@endlessm.com
Introduce a meson-gxbb-common.h header file and derive the configuration for Hardkernel Odroid-C2 board from that.
Acked-by: Beniamino Galvani b.galvani@gmail.com
On Fri, Jun 10, 2016 at 08:18:22PM +0200, Carlo Caione wrote:
From: Carlo Caione carlo@endlessm.com
Introduce a meson-gxbb-common.h header file and derive the configuration for Hardkernel Odroid-C2 board from that.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Carlo Caione carlo@endlessm.com Acked-by: Beniamino Galvani b.galvani@gmail.com
Applied to u-boot/master, thanks!
From: Carlo Caione carlo@endlessm.com
s/hardkernel/amlogic/ to have a single place for all the amlogic-based boards.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Carlo Caione carlo@endlessm.com --- 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%)
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 77d3cfe..af3be59 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -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 diff --git a/board/hardkernel/odroid-c2/Kconfig b/board/amlogic/odroid-c2/Kconfig similarity index 85% rename from board/hardkernel/odroid-c2/Kconfig rename to board/amlogic/odroid-c2/Kconfig index 687d9c6..2b16889 100644 --- a/board/hardkernel/odroid-c2/Kconfig +++ b/board/amlogic/odroid-c2/Kconfig @@ -4,7 +4,7 @@ config SYS_BOARD default "odroid-c2"
config SYS_VENDOR - default "hardkernel" + default "amlogic"
config SYS_CONFIG_NAME default "odroid-c2" diff --git a/board/hardkernel/odroid-c2/MAINTAINERS b/board/amlogic/odroid-c2/MAINTAINERS similarity index 80% rename from board/hardkernel/odroid-c2/MAINTAINERS rename to board/amlogic/odroid-c2/MAINTAINERS index 23ae1e7..699850f 100644 --- a/board/hardkernel/odroid-c2/MAINTAINERS +++ b/board/amlogic/odroid-c2/MAINTAINERS @@ -1,6 +1,6 @@ ODROID-C2 M: Beniamino Galvani b.galvani@gmail.com S: Maintained -F: board/hardkernel/odroid-c2/ +F: board/amlogic/odroid-c2/ F: include/configs/odroid-c2.h F: configs/odroid-c2_defconfig diff --git a/board/hardkernel/odroid-c2/Makefile b/board/amlogic/odroid-c2/Makefile similarity index 100% rename from board/hardkernel/odroid-c2/Makefile rename to board/amlogic/odroid-c2/Makefile diff --git a/board/hardkernel/odroid-c2/README b/board/amlogic/odroid-c2/README similarity index 100% rename from board/hardkernel/odroid-c2/README rename to board/amlogic/odroid-c2/README diff --git a/board/hardkernel/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c similarity index 100% rename from board/hardkernel/odroid-c2/odroid-c2.c rename to board/amlogic/odroid-c2/odroid-c2.c
On Fri, Jun 10, 2016 at 08:18:23PM +0200, Carlo Caione wrote:
From: Carlo Caione carlo@endlessm.com
s/hardkernel/amlogic/ to have a single place for all the amlogic-based boards.
Makes sense.
Acked-by: Beniamino Galvani b.galvani@gmail.com
On Fri, Jun 10, 2016 at 08:18:23PM +0200, Carlo Caione wrote:
From: Carlo Caione carlo@endlessm.com
s/hardkernel/amlogic/ to have a single place for all the amlogic-based boards.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Carlo Caione carlo@endlessm.com Acked-by: Beniamino Galvani b.galvani@gmail.com
Applied to u-boot/master, thanks!
On 10/06/16 20:18, Carlo Caione wrote:
From: Carlo Caione carlo@endlessm.com
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.
On Fri, Jun 24, 2016 at 11:01:03PM +0200, Carlo Caione wrote:
On 10/06/16 20:18, Carlo Caione wrote:
From: Carlo Caione carlo@endlessm.com
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.
Sorry for the delay, working on this shortly.
participants (3)
-
Beniamino Galvani -
Carlo Caione -
Tom Rini