diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-22 10:24:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-22 10:24:14 -0500 |
| commit | 71d96eb99e79ba69f47504b72cd54ce121eca422 (patch) | |
| tree | d173be2bffb60ec045f8ad631ea5c70e1b52c80c | |
| parent | c59afcff8a4ef087136e8a0ad7e2c587c32baf51 (diff) | |
| parent | 8cdb1ff33caa4b2b8644e14e602566ded506a2fa (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- Assorted Gen3 fixes
| -rw-r--r-- | arch/arm/mach-rmobile/Kconfig | 1 | ||||
| -rw-r--r-- | configs/r8a7795_salvator-x_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a7795_ulcb_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77965_salvator-x_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77965_ulcb_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a7796_salvator-x_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a7796_ulcb_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77970_eagle_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77990_ebisu_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77995_draak_defconfig | 1 |
10 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig index 8343000c8f..8cef3f5675 100644 --- a/arch/arm/mach-rmobile/Kconfig +++ b/arch/arm/mach-rmobile/Kconfig @@ -21,7 +21,6 @@ config RCAR_GEN3 imply CMD_GPT imply CMD_UUID imply CMD_MMC_SWRITE if MMC - imply OF_BOARD_SETUP if PCI imply SUPPORT_EMMC_RPMB if MMC imply SPL imply SPL_BOARD_INIT diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 497b1483db..ad7a13411c 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig index 5df54dc661..b80f2c99c3 100644 --- a/configs/r8a7795_ulcb_defconfig +++ b/configs/r8a7795_ulcb_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a77965_salvator-x_defconfig b/configs/r8a77965_salvator-x_defconfig index fa0b5a4459..a95f99cc40 100644 --- a/configs/r8a77965_salvator-x_defconfig +++ b/configs/r8a77965_salvator-x_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a77965_ulcb_defconfig b/configs/r8a77965_ulcb_defconfig index 2e8c3f2b1a..e3abe4d5aa 100644 --- a/configs/r8a77965_ulcb_defconfig +++ b/configs/r8a77965_ulcb_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 2c78df0bfe..e2bd001900 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig index a8f3c8a5a6..ce517e8b3a 100644 --- a/configs/r8a7796_ulcb_defconfig +++ b/configs/r8a7796_ulcb_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index eca37d72cd..8013a7f192 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index f968be6787..220c4b8843 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 9fc9b393c1..d0dd69d3ca 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_FIT=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set 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 |