[U-Boot] [PATCH] ARM: rmobile: lager: Move rcar-gen2-common to rcar-common
To common use of rcar-gen2-common directory in the R-Car SoCs, and change from rcar-gen2-common to rcar-common.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- board/renesas/lager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/renesas/lager/Makefile b/board/renesas/lager/Makefile index 8d03461..0e44c69 100644 --- a/board/renesas/lager/Makefile +++ b/board/renesas/lager/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0 #
-obj-y := lager.o qos.o ../rcar-gen2-common/common.o +obj-y := lager.o qos.o ../rcar-common/common.o
This commit remove dupilicate following configs from rcar-gen3-common.h. - CONFIG_CMD_BOOTZ - CONFIG_BOOTDELAY - CONFIG_CMD_EDITENV - CONFIG_CMD_SAVEENV - CONFIG_CMD_MEMORY - CONFIG_CMD_RUN - CONFIG_CMD_LOADS
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- include/configs/rcar-gen3-common.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 617a2cf..89cde20 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -13,18 +13,13 @@ #include <asm/arch/rmobile.h>
#define CONFIG_CMD_BOOTI -#define CONFIG_CMD_EDITENV -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_RUN -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FDT
#define CONFIG_REMAKE_ELF
@@ -45,7 +40,6 @@ #define CONFIG_OF_LIBFDT
#define CONFIG_BAUDRATE 115200 -#define CONFIG_BOOTDELAY 3
#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS
This moves some config from config files.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- configs/salvator-x_defconfig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 1cfdbd6..e16acd3 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -1,4 +1,12 @@ CONFIG_ARM=y +CONFIG_ARCH_RMOBILE=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y -CONFIG_SPL=y +CONFIG_BOOTSTAGE_USER_COUNT=0x20 +CONFIG_BOOTSTAGE_STASH_ADDR=0x0 +CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set
This add MMU layout for R8A7795 of Renesas ARM64 SoC.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- arch/arm/mach-rmobile/Makefile | 2 +- arch/arm/mach-rmobile/memmap-r8a7795.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-rmobile/memmap-r8a7795.c
diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile index d5bb843..3b56fcf 100644 --- a/arch/arm/mach-rmobile/Makefile +++ b/arch/arm/mach-rmobile/Makefile @@ -16,6 +16,6 @@ obj-$(CONFIG_R8A7791) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7791.o obj-$(CONFIG_R8A7792) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7792.o obj-$(CONFIG_R8A7793) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7793.o obj-$(CONFIG_R8A7794) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7794.o -obj-$(CONFIG_R8A7795) += lowlevel_init_gen3.o cpu_info-rcar.o pfc-r8a7795.o +obj-$(CONFIG_R8A7795) += lowlevel_init_gen3.o cpu_info-rcar.o pfc-r8a7795.o memmap-r8a7795.o obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o obj-$(CONFIG_TMU_TIMER) += ../../sh/lib/time.o diff --git a/arch/arm/mach-rmobile/memmap-r8a7795.c b/arch/arm/mach-rmobile/memmap-r8a7795.c new file mode 100644 index 0000000..c2c5e48 --- /dev/null +++ b/arch/arm/mach-rmobile/memmap-r8a7795.c @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2016 Nobuhiro Iwamatsu iwamatsu@nigauri.org + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/armv8/mmu.h> + +static struct mm_region r8a7795_mem_map[] = { + { + .virt = 0x0UL, + .phys = 0x0UL, + .size = 0x80000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0x80000000UL, + .phys = 0x80000000UL, + .size = 0x80000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + +struct mm_region *mem_map = r8a7795_mem_map;
participants (1)
-
Nobuhiro Iwamatsu