Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.denx.de/u-boot-sh

Browse Source
lime2-spi
Tom Rini 6 years ago
parent 8b4a610af9 74c8cb02a4
commit 9f881a590f
40 changed files with 48 additions and 133 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      arch/arm/mach-rmobile/Kconfig.32
  2. 5
      arch/arm/mach-rmobile/board.c
  3. 5
      arch/arm/mach-rmobile/include/mach/sys_proto.h
  4. 4
      board/atmark-techno/armadillo-800eva/armadillo-800eva.c
  5. 4
      board/kmc/kzm9g/kzm9g.c
  6. 4
      board/renesas/alt/alt.c
  7. 4
      board/renesas/blanche/blanche.c
  8. 4
      board/renesas/gose/gose.c
  9. 4
      board/renesas/koelsch/koelsch.c
  10. 4
      board/renesas/lager/lager.c
  11. 4
      board/renesas/porter/porter.c
  12. 4
      board/renesas/silk/silk.c
  13. 4
      board/renesas/stout/stout.c
  14. 1
      configs/alt_defconfig
  15. 1
      configs/armadillo-800eva_defconfig
  16. 1
      configs/blanche_defconfig
  17. 1
      configs/gose_defconfig
  18. 1
      configs/koelsch_defconfig
  19. 1
      configs/kzm9g_defconfig
  20. 1
      configs/lager_defconfig
  21. 1
      configs/porter_defconfig
  22. 1
      configs/silk_defconfig
  23. 1
      configs/stout_defconfig
  24. 76
      doc/README.rmobile
  25. 2
      drivers/clk/renesas/r8a7792-cpg-mssr.c
  26. 3
      include/configs/alt.h
  27. 2
      include/configs/armadillo-800eva.h
  28. 3
      include/configs/blanche.h
  29. 2
      include/configs/draak.h
  30. 2
      include/configs/eagle.h
  31. 3
      include/configs/gose.h
  32. 3
      include/configs/koelsch.h
  33. 3
      include/configs/kzm9g.h
  34. 3
      include/configs/lager.h
  35. 3
      include/configs/porter.h
  36. 2
      include/configs/salvator-x.h
  37. 3
      include/configs/silk.h
  38. 3
      include/configs/stout.h
  39. 2
      include/configs/ulcb.h
  40. 2
      scripts/config_whitelist.txt

4
arch/arm/mach-rmobile/Kconfig.32
Unescape View File

@ -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"

5
arch/arm/mach-rmobile/board.c
Unescape View File

@ -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

5
arch/arm/mach-rmobile/include/mach/sys_proto.h
Unescape View File

@ -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

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

@ -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;

4
board/kmc/kzm9g/kzm9g.c
Unescape View File

@ -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;

4
board/renesas/alt/alt.c
Unescape View File

@ -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;

4
board/renesas/blanche/blanche.c
Unescape View File

@ -468,10 +468,6 @@ int dram_init(void)
return 0;
}
const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING
};
void reset_cpu(ulong addr)
{
}

4
board/renesas/gose/gose.c
Unescape View File

@ -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;

4
board/renesas/koelsch/koelsch.c
Unescape View File

@ -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;

4
board/renesas/lager/lager.c
Unescape View File

@ -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;

4
board/renesas/porter/porter.c
Unescape View File

@ -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;

4
board/renesas/silk/silk.c
Unescape View File

@ -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;

4
board/renesas/stout/stout.c
Unescape View File

@ -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;

1
configs/alt_defconfig
Unescape View File

@ -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

1
configs/armadillo-800eva_defconfig
Unescape View File

@ -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

1
configs/blanche_defconfig
Unescape View File

@ -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"

1
configs/gose_defconfig
Unescape View File

@ -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

1
configs/koelsch_defconfig
Unescape View File

@ -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

1
configs/kzm9g_defconfig
Unescape View File

@ -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

1
configs/lager_defconfig
Unescape View File

@ -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

1
configs/porter_defconfig
Unescape View File

@ -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

1
configs/silk_defconfig
Unescape View File

@ -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

1
configs/stout_defconfig
Unescape View File

@ -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

76
doc/README.rmobile
Unescape View File

@ -7,13 +7,36 @@ family contains an ARM Cortex-A9/A53/A57.
Currently the following boards are supported:
* KMC KZM-A9-GT [3]
* Atmark-Techno Armadillo-800-EVA [4]
* Renesas Electronics Lager
* Renesas Electronics Koelsch
* Renesas Electronics Salvator-X M3
* Renesas Electronics Salvator-XS H3 ES2.0+
* Renesas Electronics ULCB M3 / H3 ES2.0+
| SoC | Board | defconfig
|===============+========================================+===================
| R8A73A0 | KMC KZM-A9-GT [3] | kzm9g_config
| R8A7734 | Atmark-Techno Armadillo-800-EVA [4] | armadillo-800eva_config
|===============+========================================+===================
| R8A7790 H2 | Renesas Electronics Lager | lager_defconfig
| | Renesas Electronics Stout | stout_defconfig
|---------------+----------------------------------------+-------------------
| R8A7791 M2-W | Renesas Electronics Koelsch | koelsch_defconfig
| | Renesas Electronics Porter | porter_defconfig
|---------------+----------------------------------------+-------------------
| R8A7792 V2H | Renesas Electronics Blanche | blanche_defconfig
|---------------+----------------------------------------+-------------------
| R8A7793 M2-N | Renesas Electronics Gose | gose_defconfig
|---------------+----------------------------------------+-------------------
| R8A7794 E2 | Renesas Electronics Alt | alt_defconfig
| | Renesas Electronics Silk | silk_defconfig
|===============+========================================+===================
| R8A7795 H3 | Renesas Electronics Salvator-XS ES2.0+ | r8a7795_salvator-x_defconfig
| R8A7795 H3 | Renesas Electronics ULCB ES2.0+ | r8a7795_ulcb
|---------------+----------------------------------------+-------------------
| R8A7796 M3-W | Renesas Electronics Salvator-X | r8a7796_salvator-x_defconfig
| R8A7796 M3-W | Renesas Electronics ULCB | r8a7796_ulcb
|---------------+----------------------------------------+-------------------
| R8A77965 M3-N | Renesas Electronics Salvator-XS | r8a77965_salvator-x_defconfig
|---------------+----------------------------------------+-------------------
| R8A77970 V3M | Renesas Electronics Eagle | r8a77970_eagle_defconfig
|---------------+----------------------------------------+-------------------
| R8A77995 D3 | Renesas Electronics Draak | r8a77995_draak_defconfig
'===============+========================================+===================
Toolchain
=========
@ -30,49 +53,14 @@ in their package feeds.
Build
=====
* KZM-A9-GT
Locate defconfig in the table above. Then apply standard build procedure:
make kzm9g_config
make
* Armadillo-800-EVA
make armadillo-800eva_config
make <board>_defconfig
make
Note: Armadillo-800-EVA's U-Boot supports booting from SDcard only.
Please see "B.2 Appendix B Boot Specifications" in hardware manual.
* Lager
make lager_config
make
* Koelsch
make koelsch_config
make
* Salvator-X M3
make r8a7796_salvator-x_defconfig
make
* Salvator-XS H3 ES2.0
make r8a7795_salvator-x_defconfig
make
* ULCB M3
make r8a7796_ulcb_defconfig
make
* ULCB H3 ES2.0
make r8a7795_ulcb_defconfig
make
Links
=====

2
drivers/clk/renesas/r8a7792-cpg-mssr.c
Unescape View File

@ -214,10 +214,8 @@ static const struct cpg_mssr_info r8a7792_cpg_mssr_info = {
.mstp_table = r8a7792_mstp_table,
.mstp_table_size = ARRAY_SIZE(r8a7792_mstp_table),
.reset_node = "renesas,r8a7792-rst",
.extal_usb_node = "usb_extal",
.mod_clk_base = MOD_CLK_BASE,
.clk_extal_id = CLK_EXTAL,
.clk_extal_usb_id = CLK_USB_EXTAL,
.pll0_div = 2,
.get_pll_config = r8a7792_get_pll_config,
};

3
include/configs/alt.h
Unescape View File

@ -10,9 +10,6 @@
#ifndef __ALT_H
#define __ALT_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

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

@ -9,8 +9,6 @@
#ifndef __ARMADILLO_800EVA_H
#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>

3
include/configs/blanche.h
Unescape View File

@ -10,9 +10,6 @@
#ifndef __BLANCHE_H
#define __BLANCHE_H
#undef DEBUG
#define CONFIG_RMOBILE_BOARD_STRING "Blanche"
#include "rcar-gen2-common.h"
/* STACK */

2
include/configs/draak.h
Unescape View File

@ -10,8 +10,6 @@
#ifndef __DRAAK_H
#define __DRAAK_H
#undef DEBUG
#include "rcar-gen3-common.h"
/* Ethernet RAVB */

2
include/configs/eagle.h
Unescape View File

@ -10,8 +10,6 @@
#ifndef __EAGLE_H
#define __EAGLE_H
#undef DEBUG
#include "rcar-gen3-common.h"
/* Ethernet RAVB */

3
include/configs/gose.h
Unescape View File

@ -9,9 +9,6 @@
#ifndef __GOSE_H
#define __GOSE_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

3
include/configs/koelsch.h
Unescape View File

@ -9,9 +9,6 @@
#ifndef __KOELSCH_H
#define __KOELSCH_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

3
include/configs/kzm9g.h
Unescape View File

@ -8,10 +8,7 @@
#ifndef __KZM9G_H
#define __KZM9G_H
#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>

3
include/configs/lager.h
Unescape View File

@ -10,9 +10,6 @@
#ifndef __LAGER_H
#define __LAGER_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

3
include/configs/porter.h
Unescape View File

@ -11,9 +11,6 @@
#ifndef __PORTER_H
#define __PORTER_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

2
include/configs/salvator-x.h
Unescape View File

@ -10,8 +10,6 @@
#ifndef __SALVATOR_X_H
#define __SALVATOR_X_H
#undef DEBUG
#include "rcar-gen3-common.h"
/* Ethernet RAVB */

3
include/configs/silk.h
Unescape View File

@ -11,9 +11,6 @@
#ifndef __SILK_H
#define __SILK_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

3
include/configs/stout.h
Unescape View File

@ -12,9 +12,6 @@
#ifndef __STOUT_H
#define __STOUT_H
#undef DEBUG
#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
#include "rcar-gen2-common.h"
#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000

2
include/configs/ulcb.h
Unescape View File

@ -10,8 +10,6 @@
#ifndef __ULCB_H
#define __ULCB_H
#undef DEBUG
#include "rcar-gen3-common.h"
/* Ethernet RAVB */

2
scripts/config_whitelist.txt
Unescape View File

@ -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
@ -1674,7 +1673,6 @@ CONFIG_REVISION_TAG
CONFIG_RFSPART
CONFIG_RIO
CONFIG_RMII
CONFIG_RMOBILE_BOARD_STRING
CONFIG_RMSTP0_ENA
CONFIG_RMSTP10_ENA
CONFIG_RMSTP11_ENA

Write Preview
Loading…
Cancel
Save