diff options
68 files changed, 89 insertions, 160 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9f653a01373..60d4adf2666 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -307,7 +307,7 @@ F: drivers/mtd/cfi_flash.c F: drivers/mtd/jedec_flash.c COLDFIRE -M: Huan Wang <alison.wang@freescale.com> +M: Huan Wang <alison.wang@nxp.com> M: Angelo Dureghello <angelo@sysam.it> S: Maintained T: git git://git.denx.de/u-boot-coldfire.git @@ -5,7 +5,7 @@ VERSION = 2018 PATCHLEVEL = 05 SUBLEVEL = -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 NAME = # *DOCUMENTATION* diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 84c1a6d07bd..1ceb329f1f7 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -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" diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c index bdb353062fe..b07dbfabc4a 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c @@ -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 diff --git a/arch/arm/mach-rmobile/include/mach/sys_proto.h b/arch/arm/mach-rmobile/include/mach/sys_proto.h index 326f6b14815..448a0f6d522 100644 --- a/arch/arm/mach-rmobile/include/mach/sys_proto.h +++ b/arch/arm/mach-rmobile/include/mach/sys_proto.h @@ -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 diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8d..d95ba7b8bfe 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -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; diff --git a/board/freescale/bsc9131rdb/MAINTAINERS b/board/freescale/bsc9131rdb/MAINTAINERS index 7cd8134aa79..272d4ad3aa5 100644 --- a/board/freescale/bsc9131rdb/MAINTAINERS +++ b/board/freescale/bsc9131rdb/MAINTAINERS @@ -1,5 +1,5 @@ BSC9131RDB BOARD -M: Poonam Aggrwal <poonam.aggrwal@freescale.com> +M: Poonam Aggrwal <poonam.aggrwal@nxp.com> S: Maintained F: board/freescale/bsc9131rdb/ F: include/configs/BSC9131RDB.h diff --git a/board/freescale/bsc9132qds/MAINTAINERS b/board/freescale/bsc9132qds/MAINTAINERS index c58fc503497..95abe3d408d 100644 --- a/board/freescale/bsc9132qds/MAINTAINERS +++ b/board/freescale/bsc9132qds/MAINTAINERS @@ -1,5 +1,5 @@ BSC9132QDS BOARD -M: Naveen Burmi <NaveenBurmi@freescale.com> +M: Naveen Burmi <naveen.burmi@nxp.com> S: Maintained F: board/freescale/bsc9132qds/ F: include/configs/BSC9132QDS.h diff --git a/board/freescale/c29xpcie/MAINTAINERS b/board/freescale/c29xpcie/MAINTAINERS index 33088396f57..44af12cdbe3 100644 --- a/board/freescale/c29xpcie/MAINTAINERS +++ b/board/freescale/c29xpcie/MAINTAINERS @@ -1,5 +1,5 @@ C29XPCIE BOARD -M: Po Liu <po.liu@freescale.com> +M: Po Liu <po.liu@nxp.com> S: Maintained F: board/freescale/c29xpcie/ F: include/configs/C29XPCIE.h diff --git a/board/freescale/ls1021aqds/MAINTAINERS b/board/freescale/ls1021aqds/MAINTAINERS index c37ab993eeb..913d251eeb7 100644 --- a/board/freescale/ls1021aqds/MAINTAINERS +++ b/board/freescale/ls1021aqds/MAINTAINERS @@ -1,5 +1,5 @@ LS1021AQDS BOARD -M: Alison Wang <alison.wang@freescale.com> +M: Alison Wang <alison.wang@nxp.com> S: Maintained F: board/freescale/ls1021aqds/ F: include/configs/ls1021aqds.h diff --git a/board/freescale/ls1021atwr/MAINTAINERS b/board/freescale/ls1021atwr/MAINTAINERS index 06d888f65ce..c8b93c64697 100644 --- a/board/freescale/ls1021atwr/MAINTAINERS +++ b/board/freescale/ls1021atwr/MAINTAINERS @@ -1,5 +1,5 @@ LS1021ATWR BOARD -M: Alison Wang <alison.wang@freescale.com> +M: Alison Wang <alison.wang@nxp.com> S: Maintained F: board/freescale/ls1021atwr/ F: include/configs/ls1021atwr.h diff --git a/board/freescale/ls1043aqds/MAINTAINERS b/board/freescale/ls1043aqds/MAINTAINERS index 992c54c95fa..3c8e8c24f70 100644 --- a/board/freescale/ls1043aqds/MAINTAINERS +++ b/board/freescale/ls1043aqds/MAINTAINERS @@ -1,5 +1,5 @@ LS1043AQDS BOARD -M: Mingkai Hu <Mingkai.Hu@freescale.com> +M: Mingkai Hu <mingkai.hu@nxp.com> S: Maintained F: board/freescale/ls1043aqds/ F: include/configs/ls1043aqds.h diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS index 87aa006455c..88fe42e1e8a 100644 --- a/board/freescale/ls1043ardb/MAINTAINERS +++ b/board/freescale/ls1043ardb/MAINTAINERS @@ -1,5 +1,5 @@ LS1043A BOARD -M: Mingkai Hu <Mingkai.hu@freescale.com> +M: Mingkai Hu <mingkai.hu@nxp.com> S: Maintained F: board/freescale/ls1043ardb/ F: board/freescale/ls1043ardb/ls1043ardb.c diff --git a/board/freescale/m52277evb/MAINTAINERS b/board/freescale/m52277evb/MAINTAINERS index 390f041183c..a2a2176f6a3 100644 --- a/board/freescale/m52277evb/MAINTAINERS +++ b/board/freescale/m52277evb/MAINTAINERS @@ -1,5 +1,5 @@ M52277EVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m52277evb/ F: include/configs/M52277EVB.h diff --git a/board/freescale/m5235evb/MAINTAINERS b/board/freescale/m5235evb/MAINTAINERS index f44422ea9d4..b15ac5f14ab 100644 --- a/board/freescale/m5235evb/MAINTAINERS +++ b/board/freescale/m5235evb/MAINTAINERS @@ -1,5 +1,5 @@ M5235EVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m5235evb/ F: include/configs/M5235EVB.h diff --git a/board/freescale/m5253demo/MAINTAINERS b/board/freescale/m5253demo/MAINTAINERS index abe065e6262..9b27f4382ea 100644 --- a/board/freescale/m5253demo/MAINTAINERS +++ b/board/freescale/m5253demo/MAINTAINERS @@ -1,5 +1,5 @@ M5253DEMO BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m5253demo/ F: include/configs/M5253DEMO.h diff --git a/board/freescale/m53017evb/MAINTAINERS b/board/freescale/m53017evb/MAINTAINERS index 700b6f700a4..ad5f0cea664 100644 --- a/board/freescale/m53017evb/MAINTAINERS +++ b/board/freescale/m53017evb/MAINTAINERS @@ -1,5 +1,5 @@ M53017EVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m53017evb/ F: include/configs/M53017EVB.h diff --git a/board/freescale/m5329evb/MAINTAINERS b/board/freescale/m5329evb/MAINTAINERS index f4f103a4c78..2f7dd2d4560 100644 --- a/board/freescale/m5329evb/MAINTAINERS +++ b/board/freescale/m5329evb/MAINTAINERS @@ -1,5 +1,5 @@ M5329EVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m5329evb/ F: include/configs/M5329EVB.h diff --git a/board/freescale/m5373evb/MAINTAINERS b/board/freescale/m5373evb/MAINTAINERS index 5db0b34a667..acb7a43ed64 100644 --- a/board/freescale/m5373evb/MAINTAINERS +++ b/board/freescale/m5373evb/MAINTAINERS @@ -1,5 +1,5 @@ M5373EVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m5373evb/ F: include/configs/M5373EVB.h diff --git a/board/freescale/m54455evb/MAINTAINERS b/board/freescale/m54455evb/MAINTAINERS index 3788f5f87ec..27ced3c7b1f 100644 --- a/board/freescale/m54455evb/MAINTAINERS +++ b/board/freescale/m54455evb/MAINTAINERS @@ -1,5 +1,5 @@ M54455EVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m54455evb/ F: include/configs/M54455EVB.h diff --git a/board/freescale/m547xevb/MAINTAINERS b/board/freescale/m547xevb/MAINTAINERS index 9a8408d257e..0d821eb011f 100644 --- a/board/freescale/m547xevb/MAINTAINERS +++ b/board/freescale/m547xevb/MAINTAINERS @@ -1,5 +1,5 @@ M547XEVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m547xevb/ F: include/configs/M5475EVB.h diff --git a/board/freescale/m548xevb/MAINTAINERS b/board/freescale/m548xevb/MAINTAINERS index 82ad9fdc60f..4e642e69d51 100644 --- a/board/freescale/m548xevb/MAINTAINERS +++ b/board/freescale/m548xevb/MAINTAINERS @@ -1,5 +1,5 @@ M548XEVB BOARD -M: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +M: TsiChung Liew <Tsi-Chung.Liew@nxp.com> S: Maintained F: board/freescale/m548xevb/ F: include/configs/M5485EVB.h diff --git a/board/freescale/mx53evk/MAINTAINERS b/board/freescale/mx53evk/MAINTAINERS index 5c5f747cb86..d511046cb05 100644 --- a/board/freescale/mx53evk/MAINTAINERS +++ b/board/freescale/mx53evk/MAINTAINERS @@ -1,5 +1,5 @@ MX53EVK BOARD -M: Jason Liu <r64343@freescale.com> +M: Jason Liu <jason.hui.liu@nxp.com> S: Maintained F: board/freescale/mx53evk/ F: include/configs/mx53evk.h diff --git a/board/freescale/mx53loco/MAINTAINERS b/board/freescale/mx53loco/MAINTAINERS index 73b113e577b..b4bd1a1842b 100644 --- a/board/freescale/mx53loco/MAINTAINERS +++ b/board/freescale/mx53loco/MAINTAINERS @@ -1,5 +1,5 @@ MX53LOCO BOARD -M: Jason Liu <r64343@freescale.com> +M: Jason Liu <jason.hui.liu@nxp.com> S: Maintained F: board/freescale/mx53loco/ F: include/configs/mx53loco.h diff --git a/board/freescale/t1040qds/MAINTAINERS b/board/freescale/t1040qds/MAINTAINERS index fb3565a7fd1..1e276e3db90 100644 --- a/board/freescale/t1040qds/MAINTAINERS +++ b/board/freescale/t1040qds/MAINTAINERS @@ -1,5 +1,5 @@ T1040QDS BOARD -M: Poonam Aggrwal <poonam.aggrwal@freescale.com> +M: Poonam Aggrwal <poonam.aggrwal@nxp.com> S: Maintained F: board/freescale/t1040qds/ F: include/configs/T1040QDS.h diff --git a/board/freescale/vf610twr/MAINTAINERS b/board/freescale/vf610twr/MAINTAINERS index f2997f05c38..b2eef8e24be 100644 --- a/board/freescale/vf610twr/MAINTAINERS +++ b/board/freescale/vf610twr/MAINTAINERS @@ -1,5 +1,5 @@ VF610TWR BOARD -M: Alison Wang <b18965@freescale.com> +M: Alison Wang <alison.wang@nxp.com> S: Maintained F: board/freescale/vf610twr/ F: include/configs/vf610twr.h diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index a284721cfde..4a791a3c57f 100644 --- a/board/kmc/kzm9g/kzm9g.c +++ b/board/kmc/kzm9g/kzm9g.c @@ -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; diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 7598b1a4b92..4b783b06166 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -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; diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 5dc307370d5..5edcdac13e3 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -468,10 +468,6 @@ int dram_init(void) return 0; } -const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { } diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index c9209701dd3..e8d39a293ab 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -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; diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 4a4007b7a36..cd07f50e5b9 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -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; diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 505efb5bc46..586c6c3842e 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -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; diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index eb66bc903e3..fcf4ff90f02 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -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; diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index c932c255a08..a50a4ed3a1f 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -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; diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index 192ee66a382..c40daf56230 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -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; diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index a4eb3514051..862644b00e4 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -93,6 +93,9 @@ int exynos_power_init(void) struct udevice *dev; int ret; +#ifdef CONFIG_PMIC_S2MPS11 + ret = pmic_get("s2mps11_pmic", &dev); +#else ret = pmic_get("max77686", &dev); if (!ret) { /* TODO(sjg@chromium.org): Move into the clock/pmic API */ @@ -112,6 +115,7 @@ int exynos_power_init(void) s5m8767_enable_32khz_cp(dev); #endif } +#endif /* CONFIG_PMIC_S2MPS11 */ if (ret == -ENODEV) return 0; diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 82499615c75..b0b864c1a19 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -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 diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 2c212e297bc..753077b6766 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -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 diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index d9c08e1a4bf..bd5fccac93d 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -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" diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 3c6a4bd41ba..84798876047 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -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 diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index f1826663560..faca5961159 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -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 diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index f34fe9be189..af931855b7c 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -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 diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 1071da24d21..901b34e1dd5 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -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 diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 64b064d1a8f..b04627efa3d 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -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 diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 4cb1179a681..c163e823b5b 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -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 diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 4f5ebfa091f..d940932bafd 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -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 diff --git a/doc/README.rmobile b/doc/README.rmobile index c65cbabc701..f1bca54520a 100644 --- a/doc/README.rmobile +++ b/doc/README.rmobile @@ -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 ===== diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c index 4ba18b18bea..46dd3c9c916 100644 --- a/drivers/clk/renesas/r8a7792-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c @@ -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, }; diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index f72b80c7048..fe7c0b39ac1 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1689,7 +1689,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps) #if CONFIG_IS_ENABLED(MMC_WRITE) err = sd_read_ssr(mmc); - if (!err) + if (err) pr_warn("unable to read ssr\n"); #endif if (!err) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index d31793a7b79..1e5e8a61591 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -462,7 +462,8 @@ static int sdhci_set_ios(struct mmc *mmc) else ctrl &= ~SDHCI_CTRL_HISPD; - if (host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) + if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) || + (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE)) ctrl &= ~SDHCI_CTRL_HISPD; sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); @@ -602,6 +603,11 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, cfg->host_caps &= ~MMC_MODE_8BIT; } + if (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE) { + cfg->host_caps &= ~MMC_MODE_HS; + cfg->host_caps &= ~MMC_MODE_HS_52MHz; + } + if (host->host_caps) cfg->host_caps |= host->host_caps; diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 9463a06ebc6..76fe97f6efd 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -54,7 +54,7 @@ static int arasan_sdhci_probe(struct udevice *dev) SDHCI_QUIRK_BROKEN_R1B; #ifdef CONFIG_ZYNQ_HISPD_BROKEN - host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT; + host->quirks |= SDHCI_QUIRK_BROKEN_HISPD_MODE; #endif host->max_clk = clock; diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c index df1550816ec..a1407318eff 100644 --- a/drivers/power/mfd/fg_max77693.c +++ b/drivers/power/mfd/fg_max77693.c @@ -60,8 +60,6 @@ static int power_update_battery(struct pmic *p, struct pmic *bat) return ret; max77693_get_vcell(&pb->bat->voltage_uV); - if (ret) - return ret; return 0; } diff --git a/include/configs/alt.h b/include/configs/alt.h index 46d7ba9a183..ba0b2fd6715 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -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 diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 6e7ac0a9055..b49407a8b29 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -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> diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ae3213f959d..a978f728c9d 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -10,9 +10,6 @@ #ifndef __BLANCHE_H #define __BLANCHE_H -#undef DEBUG -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" - #include "rcar-gen2-common.h" /* STACK */ diff --git a/include/configs/draak.h b/include/configs/draak.h index fef5e2e0118..a5c2210cc95 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -10,8 +10,6 @@ #ifndef __DRAAK_H #define __DRAAK_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/configs/eagle.h b/include/configs/eagle.h index d2d46f0425a..b570ef9115e 100644 --- a/include/configs/eagle.h +++ b/include/configs/eagle.h @@ -10,8 +10,6 @@ #ifndef __EAGLE_H #define __EAGLE_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/configs/gose.h b/include/configs/gose.h index 1f814bfe7ab..3c5c00ae6b7 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -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 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index ec2162cb803..41cab6d0ef5 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -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 diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 179c7603f26..dc05db1baf3 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -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> diff --git a/include/configs/lager.h b/include/configs/lager.h index 0d9272cfa31..d5d76c2404d 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -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 diff --git a/include/configs/porter.h b/include/configs/porter.h index ba444762f15..491adcdde15 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -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 diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 33624e6c4ea..89e1b20c293 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -10,8 +10,6 @@ #ifndef __SALVATOR_X_H #define __SALVATOR_X_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/configs/silk.h b/include/configs/silk.h index 465291fffdf..8eac7b8c9b7 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -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 diff --git a/include/configs/stout.h b/include/configs/stout.h index 22e23eb1821..ceed06f13ec 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -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 diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index dfd6436b3ca..4d76fd69e56 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -10,8 +10,6 @@ #ifndef __ULCB_H #define __ULCB_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/sdhci.h b/include/sdhci.h index 7e84012f60e..ed35f0434af 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -213,6 +213,12 @@ #define SDHCI_QUIRK_BROKEN_R1B (1 << 2) #define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3) #define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4) +/* + * SDHCI_QUIRK_BROKEN_HISPD_MODE + * the hardware cannot operate correctly in high-speed mode, + * this quirk forces the sdhci host-controller to non high-speed mode + */ +#define SDHCI_QUIRK_BROKEN_HISPD_MODE BIT(5) #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6) #define SDHCI_QUIRK_USE_WIDE8 (1 << 8) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bbc44e3291c..bdbfcbeb70c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -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 |