diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-25 12:20:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-25 12:20:51 -0500 |
| commit | 40521a6c90d4adfb7f3041033c8cbbeff087a5ca (patch) | |
| tree | d7053cb605bd7235ec3c32a36b7671324ba90f15 /include | |
| parent | d31dd3b596190bdecbd109e404f16bd208fe32ba (diff) | |
| parent | 6666408535523377428846bad5a9362d589e396c (diff) | |
| download | u-boot-40521a6c90d4adfb7f3041033c8cbbeff087a5ca.tar.gz u-boot-40521a6c90d4adfb7f3041033c8cbbeff087a5ca.tar.xz u-boot-40521a6c90d4adfb7f3041033c8cbbeff087a5ca.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
Updates and fixes for ls1028a, lx2160a, ls1012a, ls1021a, ls2080a,
ls1088a platforms:
- lx2-rev2 pcie support, enetc related updates, layerscape-pcie fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ls1012afrwy.h | 2 | ||||
| -rw-r--r-- | include/configs/ls1012ardb.h | 2 | ||||
| -rw-r--r-- | include/configs/lx2160a_common.h | 4 | ||||
| -rw-r--r-- | include/configs/lx2160aqds.h | 4 | ||||
| -rw-r--r-- | include/configs/lx2160ardb.h | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index c0519e3c11..dde4369c97 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -63,7 +63,7 @@ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "kernelheader_size=0x40000\0" \ - "kernel_addr_r=0x81000000\0" \ + "kernel_addr_r=0x96000000\0" \ "fdt_addr_r=0x90000000\0" \ "load_addr=0x96000000\0" \ "kernel_size=0x2800000\0" \ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 0341495dfb..b419c46829 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -69,7 +69,7 @@ "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ - "kernel_addr_r=0x81000000\0" \ + "kernel_addr_r=0x96000000\0" \ "fdt_addr_r=0x90000000\0" \ "load_addr=0xa0000000\0" \ "kernel_size=0x2800000\0" \ diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index cd3e2c4c85..02cccff0c8 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #ifndef __LX2_COMMON_H @@ -229,8 +229,6 @@ unsigned long get_board_ddr_clk(void); BOOTENV \ "mcmemsize=0x70000000\0" \ XSPI_MC_INIT_CMD \ - "boot_scripts=lx2160ardb_boot.scr\0" \ - "boot_script_hdr=hdr_lx2160ardb_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 662e601f0f..f25cab18ae 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #ifndef __LX2_QDS_H @@ -120,6 +120,8 @@ u8 qixis_esdhc_detect_quirk(void); #define CONFIG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "lx2160aqds_vdd_mv=800\0" \ + "boot_scripts=lx2160aqds_boot.scr\0" \ + "boot_script_hdr=hdr_lx2160aqds_bs.out\0" \ "BOARD=lx2160aqds\0" \ "xspi_bootcmd=echo Trying load from flexspi..;" \ "sf probe 0:0 && sf read $load_addr " \ diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index c6bacb65ec..de385f82c8 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018 NXP + * Copyright 2018,2020 NXP */ #ifndef __LX2_RDB_H @@ -89,6 +89,8 @@ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ + "boot_scripts=lx2160ardb_boot.scr\0" \ + "boot_script_hdr=hdr_lx2160ardb_bs.out\0" \ "lx2160ardb_vdd_mv=800\0" \ "BOARD=lx2160ardb\0" \ "xspi_bootcmd=echo Trying load from flexspi..;" \ |