mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-14 12:56:00 +01:00
Merge branch 'master' of git://git.denx.de/u-boot-sh
- Assorted Gen3 fixes
This commit is contained in:
commit
71d96eb99e
@ -21,7 +21,6 @@ config RCAR_GEN3
|
|||||||
imply CMD_GPT
|
imply CMD_GPT
|
||||||
imply CMD_UUID
|
imply CMD_UUID
|
||||||
imply CMD_MMC_SWRITE if MMC
|
imply CMD_MMC_SWRITE if MMC
|
||||||
imply OF_BOARD_SETUP if PCI
|
|
||||||
imply SUPPORT_EMMC_RPMB if MMC
|
imply SUPPORT_EMMC_RPMB if MMC
|
||||||
imply SPL
|
imply SPL
|
||||||
imply SPL_BOARD_INIT
|
imply SPL_BOARD_INIT
|
||||||
|
@ -9,7 +9,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6338000
|
CONFIG_SPL_TEXT_BASE=0xe6338000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6338000
|
CONFIG_SPL_TEXT_BASE=0xe6338000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6338000
|
CONFIG_SPL_TEXT_BASE=0xe6338000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6338000
|
CONFIG_SPL_TEXT_BASE=0xe6338000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6338000
|
CONFIG_SPL_TEXT_BASE=0xe6338000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6338000
|
CONFIG_SPL_TEXT_BASE=0xe6338000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x40000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6318000
|
CONFIG_SPL_TEXT_BASE=0xe6318000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6318000
|
CONFIG_SPL_TEXT_BASE=0xe6318000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0xFFFE0000
|
|||||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
CONFIG_SPL_TEXT_BASE=0xe6318000
|
CONFIG_SPL_TEXT_BASE=0xe6318000
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
|
Loading…
x
Reference in New Issue
Block a user