ARM: rmobile: Fix CONFIG_RMOBILE_BOARD_STRING
Subsystems (2)
PATCH 1/3 ARM: rmobile: Fix CONFIG_RMOBILE_BOARD_STRING
Rename CONFIG_RMOBILE_BOARD_STRING to CONFIG_ARCH_RMOBILE_BOARD_STRING to make things consistent, no functional change.
Signed-off-by Marek Vasut <[email protected]>
Cc Nobuhiro Iwamatsu <[email protected]>
--- board/renesas/blanche/blanche.c | 2 +- include/configs/blanche.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
board/renesas/blanche/blanche.c +1 -1
@@ -469,7 +469,7 @@ int dram_init(void) }const struct rmobile_sysinfo sysinfo = { -CONFIG_RMOBILE_BOARD_STRING +CONFIG_ARCH_RMOBILE_BOARD_STRING };void reset_cpu (ulong addr)
include/configs/blanche.h +1 -1
@@ -11,7 +11,7 @@#define __BLANCHE_H#undef DEBUG -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" +#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Blanche"#include "rcar-gen2-common.h"
scripts/config_whitelist.txt +0 -1
@@ -1674,7 +1674,6 @@ CONFIG_REVISION_TAG CONFIG_RFSPART CONFIG_RIO CONFIG_RMII -CONFIG_RMOBILE_BOARD_STRING CONFIG_RMSTP0_ENA CONFIG_RMSTP10_ENA CONFIG_RMSTP11_ENA
Signature · 1 line
2.16.2
PATCH 2/3 ARM: rmobile: Convert CONFIG_ARCH_RMOBILE_BOARD_STRING to Kconfig
Convert the symbol to Kconfig, no functional change.
Signed-off-by Marek Vasut <[email protected]>
Cc Nobuhiro Iwamatsu <[email protected]>
--- arch/arm/mach-rmobile/Kconfig.32 | 4 ++++ configs/alt_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/blanche_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/kzm9g_defconfig | 1 + configs/lager_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + configs/stout_defconfig | 1 + include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 1 - 22 files changed, 14 insertions(+), 11 deletions(-)
arch/arm/mach-rmobile/Kconfig.32 +4 -0
@@ -1,5 +1,9 @@ if RCAR_32 +config ARCH_RMOBILE_BOARD_STRING + string "Renesas RCar Gen2 board name" + default "Board" + config RCAR_GEN2 bool "Renesas RCar Gen2"
configs/alt_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Alt" CONFIG_R8A7794=y CONFIG_TARGET_ALT=y CONFIG_SPL_SERIAL_SUPPORT=y
configs/armadillo-800eva_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0xE80C0000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Armadillo-800EVA Board" CONFIG_R8A7740=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_BOOTDELAY=3
configs/blanche_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche" CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot"
configs/gose_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Gose" CONFIG_R8A7793=y CONFIG_TARGET_GOSE=y CONFIG_SPL_SERIAL_SUPPORT=y
configs/koelsch_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Koelsch" CONFIG_R8A7791=y CONFIG_TARGET_KOELSCH=y CONFIG_SPL_SERIAL_SUPPORT=y
configs/kzm9g_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="KMC KZM-A9-GT" CONFIG_TARGET_KZM9G=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/lager_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Lager" CONFIG_R8A7790=y CONFIG_TARGET_LAGER=y CONFIG_SPL_SERIAL_SUPPORT=y
configs/porter_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Porter" CONFIG_R8A7791=y CONFIG_TARGET_PORTER=y CONFIG_SPL_SERIAL_SUPPORT=y
configs/silk_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Silk" CONFIG_R8A7794=y CONFIG_TARGET_SILK=y CONFIG_SPL_SERIAL_SUPPORT=y
configs/stout_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Stout" CONFIG_R8A7790=y CONFIG_TARGET_STOUT=y CONFIG_SPL_SERIAL_SUPPORT=y
include/configs/alt.h +0 -1
@@ -11,7 +11,6 @@#define __ALT_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"#include "rcar-gen2-common.h"
include/configs/armadillo-800eva.h +0 -1
@@ -10,7 +10,6 @@#define __ARMADILLO_800EVA_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"#define CONFIG_SH_GPIO_PFC #include <asm/arch/rmobile.h>
include/configs/blanche.h +0 -1
@@ -11,7 +11,6 @@#define __BLANCHE_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Blanche"#include "rcar-gen2-common.h"
include/configs/gose.h +0 -1
@@ -10,7 +10,6 @@#define __GOSE_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"#include "rcar-gen2-common.h"
include/configs/koelsch.h +0 -1
@@ -10,7 +10,6 @@#define __KOELSCH_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"#include "rcar-gen2-common.h"
include/configs/kzm9g.h +0 -1
@@ -11,7 +11,6 @@#undef DEBUG#define CONFIG_SH73A0 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT"#define CONFIG_MACH_TYPE MACH_TYPE_KZM9G#include <asm/arch/rmobile.h>
include/configs/lager.h +0 -1
@@ -11,7 +11,6 @@#define __LAGER_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"#include "rcar-gen2-common.h"
include/configs/porter.h +0 -1
@@ -12,7 +12,6 @@#define __PORTER_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"#include "rcar-gen2-common.h"
include/configs/silk.h +0 -1
@@ -12,7 +12,6 @@#define __SILK_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"#include "rcar-gen2-common.h"
include/configs/stout.h +0 -1
@@ -13,7 +13,6 @@#define __STOUT_H#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"#include "rcar-gen2-common.h"
scripts/config_whitelist.txt +0 -1
@@ -43,7 +43,6 @@ CONFIG_ARCH_KIRKWOOD CONFIG_ARCH_MAP_SYSMEM CONFIG_ARCH_OMAP4 CONFIG_ARCH_ORION5X -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP
Signature · 1 line
2.16.2
PATCH 3/3 ARM: rmobile: Contain CONFIG_ARCH_RMOBILE_BOARD_STRING
In reply to Marek VasutPull the symbol from the boards and zap struct rmobile_sysinfo as they are rather useless. The entire purpose of that whole machinery was to print board name in the CONFIG_ARCH_RMOBILE_BOARD_STRING. Do that in a far simpler and more contained manner.
Signed-off-by Marek Vasut <[email protected]>
Cc Nobuhiro Iwamatsu <[email protected]>
--- arch/arm/mach-rmobile/board.c | 5 ++--- arch/arm/mach-rmobile/include/mach/sys_proto.h | 5 ----- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 4 ---- board/kmc/kzm9g/kzm9g.c | 4 ---- board/renesas/alt/alt.c | 4 ---- board/renesas/blanche/blanche.c | 4 ---- board/renesas/gose/gose.c | 4 ---- board/renesas/koelsch/koelsch.c | 4 ---- board/renesas/lager/lager.c | 4 ---- board/renesas/porter/porter.c | 4 ---- board/renesas/silk/silk.c | 4 ---- board/renesas/stout/stout.c | 4 ---- 12 files changed, 2 insertions(+), 48 deletions(-)
arch/arm/mach-rmobile/board.c +2 -3
@@ -6,12 +6,11 @@*/ #include <common.h> #include <asm/io.h> -#include <asm/arch/sys_proto.h> -#ifndef CONFIG_RCAR_GEN3 +#ifdef CONFIG_ARCH_RMOBILE_BOARD_STRING int checkboard (void ) { -printf ("Board: %s\n" , sysinfo.board_string); +printf ("Board: %s\n" ,CONFIG_ARCH_RMOBILE_BOARD_STRING );return 0 ; }#endif
arch/arm/mach-rmobile/include/mach/sys_proto.h +0 -5
@@ -8,9 +8,4 @@#ifndef _SYS_PROTO_H_#define _SYS_PROTO_H_ -struct rmobile_sysinfo { -char *board_string; -}; -extern const struct rmobile_sysinfo sysinfo; -#endif
board/atmark-techno/armadillo-800eva/armadillo-800eva.c +0 -4
@@ -314,10 +314,6 @@ int dram_init(void)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -int board_late_init (void ) {return 0 ;
board/kmc/kzm9g/kzm9g.c +0 -4
@@ -348,10 +348,6 @@ int board_init(void)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -int dram_init (void ) { gd->ram_size =CONFIG_SYS_SDRAM_SIZE ;
board/renesas/alt/alt.c +0 -4
@@ -106,10 +106,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) {struct udevice *dev;
board/renesas/blanche/blanche.c +0 -4
@@ -468,10 +468,6 @@ int dram_init(void)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) { }
board/renesas/gose/gose.c +0 -4
@@ -111,10 +111,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) {struct udevice *dev;
board/renesas/koelsch/koelsch.c +0 -4
@@ -113,10 +113,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) {struct udevice *dev;
board/renesas/lager/lager.c +0 -4
@@ -122,10 +122,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) {struct udevice *dev;
board/renesas/porter/porter.c +0 -4
@@ -111,10 +111,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) {struct udevice *dev;
board/renesas/silk/silk.c +0 -4
@@ -106,10 +106,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -void reset_cpu (ulong addr) {struct udevice *dev;
board/renesas/stout/stout.c +0 -4
@@ -125,10 +125,6 @@ int board_phy_config(struct phy_device *phydev)return 0 ; } -const struct rmobile_sysinfo sysinfo = { -CONFIG_ARCH_RMOBILE_BOARD_STRING -}; -enum env_location env_get_location (enum env_operation op,int prio) {const u32 load_magic =0xb33fc0de ;
Signature · 1 line
2.16.2
PATCH 3/3 ARM: rmobile: Contain CONFIG_ARCH_RMOBILE_BOARD_STRING
Quoted 5 lines · On Wed, 2 May 2018 11:57:41 +0200 Marek Vasut <[email protected]> wrote:
Pull the symbol from the boards and zap struct
rmobile_sysinfoas they are rather useless. The entire purpose of that whole machinery was to print board name in theCONFIG_ARCH_RMOBILE_BOARD_STRING. Do that in a far simpler and more contained manner.
Note that if your SoC/board supports DT, common/board_info.c comes with a common implementation for printing out the "model" property from DT, allowing further zapping of such code.