From: Tom Rini Date: Wed, 29 Apr 2020 14:39:18 +0000 (-0400) Subject: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh X-Git-Tag: v2020.07-rc2~26 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6864fc8704661878294d1f0f981f47e864ef470f;p=oweals%2Fu-boot.git Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh - rmobile gen2/gen3 DTS sync and defconfig consolidation --- 6864fc8704661878294d1f0f981f47e864ef470f diff --cc configs/rcar3_salvator-x_defconfig index 0000000000,036d458ae2..3031fdde2d mode 000000,100644..100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@@ -1,0 -1,70 +1,71 @@@ + CONFIG_ARM=y + CONFIG_ARCH_CPU_INIT=y + CONFIG_ARCH_RMOBILE=y + CONFIG_SYS_TEXT_BASE=0x50000000 + CONFIG_ENV_SIZE=0x20000 + CONFIG_ENV_OFFSET=0xFFFE0000 + CONFIG_DM_GPIO=y + CONFIG_RCAR_GEN3=y + CONFIG_TARGET_SALVATOR_X=y -CONFIG_SMBIOS_PRODUCT_NAME="" + CONFIG_SPL_TEXT_BASE=0xe6338000 ++CONFIG_SMBIOS_PRODUCT_NAME="" + CONFIG_FIT=y + CONFIG_USE_BOOTARGS=y + CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" + CONFIG_SUPPORT_RAW_INITRD=y + CONFIG_DEFAULT_FDT_FILE="r8a77950-salvator-x.dtb" + CONFIG_VERSION_VARIABLE=y + CONFIG_HUSH_PARSER=y + CONFIG_CMD_BOOTZ=y + CONFIG_CMD_GPIO=y + CONFIG_CMD_I2C=y + CONFIG_CMD_MMC=y + CONFIG_CMD_PCI=y + CONFIG_CMD_USB=y + CONFIG_CMD_DHCP=y + CONFIG_CMD_MII=y + CONFIG_CMD_PING=y + CONFIG_CMD_EXT2=y + CONFIG_CMD_EXT4=y + CONFIG_CMD_EXT4_WRITE=y + CONFIG_CMD_FAT=y + CONFIG_CMD_FS_GENERIC=y + CONFIG_OF_CONTROL=y + CONFIG_DEFAULT_DEVICE_TREE="r8a77950-salvator-x-u-boot" + CONFIG_OF_LIST="r8a77950-salvator-x-u-boot r8a77960-salvator-x-u-boot r8a77965-salvator-x-u-boot" + CONFIG_MULTI_DTB_FIT_LZO=y + CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y + CONFIG_ENV_IS_IN_MMC=y + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_REGMAP=y + CONFIG_SYSCON=y + CONFIG_CLK=y + CONFIG_CLK_RENESAS=y + CONFIG_RCAR_GPIO=y + CONFIG_DM_I2C=y + CONFIG_SYS_I2C_RCAR_IIC=y + CONFIG_DM_MMC=y + CONFIG_MMC_IO_VOLTAGE=y + CONFIG_MMC_UHS_SUPPORT=y + CONFIG_MMC_HS400_SUPPORT=y + CONFIG_RENESAS_SDHI=y ++CONFIG_BITBANGMII=y + CONFIG_PHY_MICREL=y + CONFIG_PHY_MICREL_KSZ90X1=y + CONFIG_DM_ETH=y + CONFIG_RENESAS_RAVB=y + CONFIG_PCI=y + CONFIG_DM_PCI=y + CONFIG_PCI_RCAR_GEN3=y + CONFIG_DM_REGULATOR=y + CONFIG_DM_REGULATOR_FIXED=y + CONFIG_DM_REGULATOR_GPIO=y + CONFIG_SCIF_CONSOLE=y + CONFIG_USB=y + CONFIG_DM_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_EHCI_HCD=y + CONFIG_USB_EHCI_GENERIC=y + CONFIG_USB_STORAGE=y + CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_SMBIOS_MANUFACTURER="" diff --cc configs/rcar3_ulcb_defconfig index 0000000000,fdedba52ce..53ea93801b mode 000000,100644..100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@@ -1,0 -1,68 +1,69 @@@ + CONFIG_ARM=y + CONFIG_ARCH_CPU_INIT=y + CONFIG_ARCH_RMOBILE=y + CONFIG_SYS_TEXT_BASE=0x50000000 + CONFIG_SYS_MALLOC_F_LEN=0x2000 + CONFIG_ENV_SIZE=0x20000 + CONFIG_ENV_OFFSET=0xFFFE0000 + CONFIG_DM_GPIO=y + CONFIG_RCAR_GEN3=y + CONFIG_TARGET_ULCB=y -CONFIG_SMBIOS_PRODUCT_NAME="" + CONFIG_SPL_TEXT_BASE=0xe6338000 ++CONFIG_SMBIOS_PRODUCT_NAME="" + CONFIG_FIT=y + CONFIG_USE_BOOTARGS=y + CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" + CONFIG_SUPPORT_RAW_INITRD=y + CONFIG_DEFAULT_FDT_FILE="r8a77950-ulcb.dtb" + CONFIG_VERSION_VARIABLE=y + CONFIG_HUSH_PARSER=y + CONFIG_CMD_BOOTZ=y + CONFIG_CMD_GPIO=y + CONFIG_CMD_I2C=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_DHCP=y + CONFIG_CMD_MII=y + CONFIG_CMD_PING=y + CONFIG_CMD_EXT2=y + CONFIG_CMD_EXT4=y + CONFIG_CMD_EXT4_WRITE=y + CONFIG_CMD_FAT=y + CONFIG_CMD_FS_GENERIC=y + CONFIG_OF_CONTROL=y + CONFIG_DEFAULT_DEVICE_TREE="r8a77950-ulcb-u-boot" + CONFIG_OF_LIST="r8a77950-ulcb-u-boot r8a77960-ulcb-u-boot r8a77965-ulcb-u-boot" + CONFIG_MULTI_DTB_FIT_LZO=y + CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y + CONFIG_ENV_IS_IN_MMC=y + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_REGMAP=y + CONFIG_SYSCON=y + CONFIG_CLK=y + CONFIG_CLK_RENESAS=y + CONFIG_RCAR_GPIO=y + CONFIG_DM_I2C=y + CONFIG_SYS_I2C_RCAR_IIC=y + CONFIG_DM_MMC=y + CONFIG_MMC_IO_VOLTAGE=y + CONFIG_MMC_UHS_SUPPORT=y + CONFIG_MMC_HS400_SUPPORT=y + CONFIG_RENESAS_SDHI=y ++CONFIG_BITBANGMII=y + CONFIG_PHY_MICREL=y + CONFIG_PHY_MICREL_KSZ90X1=y + CONFIG_DM_ETH=y + CONFIG_RENESAS_RAVB=y + CONFIG_DM_REGULATOR=y + CONFIG_DM_REGULATOR_FIXED=y + CONFIG_DM_REGULATOR_GPIO=y + CONFIG_SCIF_CONSOLE=y + CONFIG_SYSRESET=y + CONFIG_USB=y + CONFIG_DM_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_EHCI_HCD=y + CONFIG_USB_EHCI_GENERIC=y + CONFIG_USB_STORAGE=y + CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_SMBIOS_MANUFACTURER=""