leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE

Browse Source 
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Nobuhiro Iwamatsu 2015-10-10 05:58:28 +09:00
parent 7a7d246d97
commit 1cc95f6e1b
40 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Kconfig
View File

@ -575,9 +575,11 @@ config AM43XX
protocols, dual camera support, optional 3D graphics
and an optional customer programmable secure boot.
config RMOBILE
config ARCH_RMOBILE
bool "Renesas ARM SoCs"
select CPU_V7
select DM
select DM_SERIAL
config TARGET_S32V234EVB
bool "Support s32v234evb"

2
arch/arm/Makefile
View File

@ -59,7 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SUNXI) += sunxi
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
machine-$(CONFIG_RMOBILE) += rmobile
machine-$(CONFIG_ARCH_RMOBILE) += rmobile
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_STM32) += stm32
machine-$(CONFIG_TEGRA) += tegra

2
arch/arm/mach-rmobile/Kconfig
View File

@ -1,4 +1,4 @@
if RMOBILE
if ARCH_RMOBILE
choice
prompt "Renesus ARM SoCs board select"

4
arch/arm/mach-rmobile/include/mach/rmobile.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_ARCH_RMOBILE_H
#define __ASM_ARCH_RMOBILE_H
#if defined(CONFIG_RMOBILE)
#if defined(CONFIG_ARCH_RMOBILE)
#if defined(CONFIG_SH73A0)
#include <asm/arch/sh73a0.h>
#elif defined(CONFIG_R8A7740)
@ -17,7 +17,7 @@
#else
#error "SOC Name not defined"
#endif
#endif /* CONFIG_RMOBILE */
#endif /* CONFIG_ARCH_RMOBILE */
#ifndef __ASSEMBLY__
u32 rmobile_get_cpu_type(void);

2
board/atmark-techno/armadillo-800eva/armadillo-800eva.c
View File

@ -315,7 +315,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
int board_late_init(void)

2
board/kmc/kzm9g/kzm9g.c
View File

@ -349,7 +349,7 @@ int board_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
int dram_init(void)

2
board/renesas/alt/alt.c
View File

@ -217,7 +217,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)

6
board/renesas/alt/qos.c
View File

@ -13,7 +13,7 @@
#include <asm/io.h>
#include <asm/arch/rmobile.h>
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
/* QoS version 0.311 for ES1 and version 0.321 for ES2 */
enum {
@ -993,8 +993,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon);
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

2
board/renesas/gose/gose.c
View File

@ -201,7 +201,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)

6
board/renesas/gose/qos.c
View File

@ -13,7 +13,7 @@
#include <asm/io.h>
#include <asm/arch/rmobile.h>
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
/* QoS version 0.311 */
enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
@ -1196,8 +1196,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon);
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

2
board/renesas/koelsch/koelsch.c
View File

@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)

6
board/renesas/koelsch/qos.c
View File

@ -14,7 +14,7 @@
#include <asm/arch/rmobile.h>
/* QoS version 0.240 for ES1 and version 0.411 for ES2 */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@ -1384,8 +1384,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon);
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

2
board/renesas/lager/lager.c
View File

@ -235,7 +235,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)

6
board/renesas/lager/qos.c
View File

@ -13,7 +13,7 @@
#include <asm/arch/rmobile.h>
/* QoS version 0.955 for ES1 and version 0.973 for ES2 */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@ -2426,8 +2426,8 @@ void qos_init(void)
else
qos_init_es1();
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

2
board/renesas/porter/porter.c
View File

@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)

6
board/renesas/porter/qos.c
View File

@ -15,7 +15,7 @@
#include <asm/arch/rmobile.h>
/* QoS version 0.240 for ES1 and version 0.334 for ES2 */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@ -1305,8 +1305,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon);
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

6
board/renesas/silk/qos.c
View File

@ -14,7 +14,7 @@
#include <asm/io.h>
#include <asm/arch/rmobile.h>
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
/* QoS version 0.11 */
enum {
@ -944,8 +944,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon);
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

2
board/renesas/silk/silk.c
View File

@ -192,7 +192,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)

6
board/renesas/stout/qos.c
View File

@ -15,7 +15,7 @@
#include <asm/arch/rmobile.h>
/* QoS version 0.955 for ES1 and version 0.973 for ES2 */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@ -2428,8 +2428,8 @@ void qos_init(void)
else
qos_init_es1();
}
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void)
{
}
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

2
board/renesas/stout/stout.c
View File

@ -217,7 +217,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_BOARD_STRING
};
static const struct sh_serial_platdata serial_platdata = {

2
configs/alt_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_ALT=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/armadillo-800eva_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_ARMADILLO_800EVA=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/gose_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_GOSE=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/koelsch_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_KOELSCH=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/kzm9g_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_KZM9G=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_PROMPT="KZM-A9-GT# "

2
configs/lager_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_LAGER=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/porter_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_PORTER=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/silk_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_SILK=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
configs/stout_defconfig
View File

@ -1,5 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_STOUT=y
CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set

2
drivers/mmc/sh_mmcif.h
View File

@ -196,7 +196,7 @@ struct sh_mmcif_regs {
#define SOFT_RST_OFF (0 << 31)
#define CLKDEV_EMMC_DATA 52000000 /* 52MHz */
#ifdef CONFIG_RMOBILE
#ifdef CONFIG_ARCH_RMOBILE
#define MMC_CLK_DIV_MIN(clk) (clk / (1 << 9))
#define MMC_CLK_DIV_MAX(clk) (clk / (1 << 1))
#else

6
include/configs/alt.h
View File

@ -12,17 +12,17 @@
#undef DEBUG
#define CONFIG_R8A7794
#define CONFIG_RMOBILE_BOARD_STRING "Alt"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"
#include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC

2
include/configs/armadillo-800eva.h
View File

@ -11,7 +11,7 @@
#undef DEBUG
#define CONFIG_R8A7740
#define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
#define CONFIG_SH_GPIO_PFC
#include <asm/arch/rmobile.h>

6
include/configs/gose.h
View File

@ -11,18 +11,18 @@
#undef DEBUG
#define CONFIG_R8A7793
#define CONFIG_RMOBILE_BOARD_STRING "Gose"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"
#include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif
/* STACK */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC

6
include/configs/koelsch.h
View File

@ -11,18 +11,18 @@
#undef DEBUG
#define CONFIG_R8A7791
#define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"
#include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif
/* STACK */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC

2
include/configs/kzm9g.h
View File

@ -14,7 +14,7 @@
#define CONFIG_SH73A0
#define CONFIG_KZM_A9_GT
#define CONFIG_RMOBILE_BOARD_STRING "KMC KZM-A9-GT"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT"
#define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
#include <asm/arch/rmobile.h>

4
include/configs/lager.h
View File

@ -12,11 +12,11 @@
#undef DEBUG
#define CONFIG_R8A7790
#define CONFIG_RMOBILE_BOARD_STRING "Lager"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"
#include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0xB0000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE8080000

6
include/configs/porter.h
View File

@ -13,17 +13,17 @@
#undef DEBUG
#define CONFIG_R8A7791
#define CONFIG_RMOBILE_BOARD_STRING "Porter"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
#include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC

6
include/configs/silk.h
View File

@ -13,17 +13,17 @@
#undef DEBUG
#define CONFIG_R8A7794
#define CONFIG_RMOBILE_BOARD_STRING "Silk"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
#include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC

4
include/configs/stout.h
View File

@ -14,13 +14,13 @@
#undef DEBUG
#define CONFIG_R8A7790
#define CONFIG_RMOBILE_BOARD_STRING "Stout"
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
#include "rcar-gen2-common.h"
/* #define CONFIG_BOARD_LATE_INIT */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0xB0000000
#else
#define CONFIG_SYS_TEXT_BASE 0xE8080000

2
include/sh_tmu.h
View File

@ -47,7 +47,7 @@ struct tmu_regs {
};
#endif /* CONFIG_CPU_SH3 */
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_RMOBILE)
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE)
struct tmu_regs {
u32 reserved;
u8 tstr;