nxp: ls: update uboot from 2017.11 to 2018.03

update uboot from 2017.11 to 2018.03 for nxp ls series machines,
include ls1043ardb, ls1046ardb, ls1088ardb and ls2088ardb.

Signed-off-by: Qiang Zhao <[email protected]>
Signed-off-by: Alex Doyle <[email protected]>

machine/nxp/nxp_ls1043ardb/machine.make

@@ -34,7 +34,7 @@ KEXEC_ENABLE = yes
 UBOOT_DTB_ENABLE = yes
 
 # Set the desired U-Boot version
-UBOOT_VERSION = 2017.11
+UBOOT_VERSION = 2018.03
 
 # Specify Linux kernel version -- comment out to use the default
 LINUX_VERSION = 4.9

machine/nxp/nxp_ls1043ardb/u-boot/platform-ls1043ardb-add-ONIE-support.patch

@@ -1,4 +1,4 @@
-From 219769c2c9c3d615db610329db2a182134048ff9 Mon Sep 17 00:00:00 2001
+From 2ac8d2c8fdf4572264f5b89d9769b1a620bada78 Mon Sep 17 00:00:00 2001
 From: Zhao Qiang <[email protected]>
 Date: Wed, 29 Nov 2017 14:20:13 +0800
 Subject: [PATCH] platform: ls1043ardb: add ONIE support
@@ -7,19 +7,20 @@ Add ONIE support for Freescale ls1043ardb platform.
 
 Signed-off-by: Zhao Qiang <[email protected]>
 ---
- configs/ls1043ardb_ONIE_0_defconfig | 38 ++++++++++++++++++++++++++++++
- include/configs/ls1043ardb.h        | 47 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 85 insertions(+)
+ configs/ls1043ardb_ONIE_0_defconfig | 39 +++++++++++++++++++++++++++
+ include/configs/ls1043ardb.h        | 53 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 92 insertions(+)
  create mode 100644 configs/ls1043ardb_ONIE_0_defconfig
 
 diff --git a/configs/ls1043ardb_ONIE_0_defconfig b/configs/ls1043ardb_ONIE_0_defconfig
 new file mode 100644
-index 0000000..61bd1a5
+index 0000000..36b2b23
 --- /dev/null
 +++ b/configs/ls1043ardb_ONIE_0_defconfig
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,39 @@
 +CONFIG_ARM=y
 +CONFIG_TARGET_LS1043ARDB=y
++CONFIG_SYS_TEXT_BASE=0x60100000
 +CONFIG_FSL_LS_PPA=y
 +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
 +CONFIG_SYS_EXTRA_OPTIONS="ONIE,ONIE_PLATFORM_REV=0"
@@ -57,10 +58,10 @@ index 0000000..61bd1a5
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_STORAGE=y
 diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
-index b4b4d5e..b998467 100644
+index 06e2450..8dacd1c 100644
 --- a/include/configs/ls1043ardb.h
 +++ b/include/configs/ls1043ardb.h
-@@ -302,4 +302,51 @@
+@@ -294,4 +294,57 @@
 
  #include <asm/fsl_secure_boot.h>
 
@@ -86,6 +87,12 @@ index b4b4d5e..b998467 100644
 +#undef CONFIG_CMD_EXT2
 +#undef CONFIG_CMD_DHCP
 +#undef CONFIG_IDENT_STRING
++#undef CONFIG_SYS_LONGHELP
++#undef CONFIG_AUTO_COMPLETE
++#undef CONFIG_BOOTP_BOOTPATH
++#undef CONFIG_BOOTP_GATEWAY
++#undef CONFIG_BOOTP_HOSTNAME
++#undef CONFIG_BOOTP_SUBNETMASK
 +
 +#include "configs/common_config.h"
 +

machine/nxp/nxp_ls1043ardb/u-boot/series

@@ -1,131 +1,109 @@
-0001-drivers-net-ldpaa_eth-Correct-error-handler-for-qbma.patch
-0002-armv8-ls1088a-Move-CONFIG_SPI_FLASH_SPANSION-to-defc.patch
-0003-mtd-nand-fsl-ifc-fix-support-of-multiple-NAND-device.patch
-0004-armv8-ls1088-Enable-SATA-for-ls1088.patch
-0005-armv8-ls1088ardb-Add-SD-boot-support-for-ls1088.patch
-0006-armv8-ls1088aqds-Add-SD-boot-support-for-ls1088qds.patch
-0007-armv8-ls1088ardb-Add-distro-boot-support.patch
-0008-driver-net-fsl-mc-Use-base-16-in-simple_strtoul.patch
-0009-cmd-mac-Update-description-of-help.patch
-0010-armv8-ls1043ardb-Add-sd_bootcmd-for-distro-fallback-.patch
-0011-armv8-ls1046ardb-Add-sd_bootcmd-for-distro-fallback-.patch
-0012-armv7-ls1021atwr-Add-sd_bootcmd-for-distro-fallback-.patch
-0013-armv8-ls2080ardb-Add-sd_bootcmd-for-distro-fallback-.patch
-0014-mtd-cfi-Fix-checking-status-register-feature.patch
-0015-arm64-show_regs-show-the-address-before-relocation.patch
-0016-armv8-mmu-fix-page-table-mapping.patch
-0017-scripts-spl-fix-typo.patch
-0018-powerpc-T104xRDB-Fix-endian-access-issue-on-EHCI-int.patch
-0019-powerpc-p1_p2_rdb_pc-Fix-endian-access-issue-on-EHCI.patch
-0020-powerpc-mpc85xx-Fix-static-TLB-table-for-SDRAM.patch
-0021-armv8-ls1088a-Unset-USE_BOOTCOMMAND-in-defconfig.patch
-0022-driver-net-fsl-mc-flib-changes-for-MC-10.3.0.patch
-0023-armv8-ls1088-Add-fsl_fdt_fixup_flash.patch
-0024-armv8-fsl-layerscape-Add-support-of-disabling-core-p.patch
-0025-armv8-Workaround-for-USB-erratua-on-LS1012A.patch
-0026-armv8-ls1012a-Modify-Kernel-and-Environment-offset.patch
-0027-armv8-LS1088A_QSPI-SECURE_BOOT-Images-validation.patch
-0028-armv8-LS1088A_QSPI-Add-secure-boot-defconfigs-for-QS.patch
-0029-armv8-LS2080A_SECURE_BOOT-Enable-CONFIG_FSL_LS_PPA.patch
-0030-SECURE-BOOT-Add-fall-back-option.patch
-0031-driver-fsl-mc-MC-object-cleanup-when-DPL-not-loaded.patch
-0032-armv8-ls1088a-Add-nand-support-for-ls1088ardb.patch
-0033-armv8-ls1088ardb-support-force-SDHC-mode-by-hwconfig.patch
-0034-arm64-ls1012ardb-Add-distro-boot-support.patch
-0035-arm64-ls1012afrdm-Add-distro-boot-support.patch
-0036-armv8-ls1043a-ls2080a-check-SoC-by-device-ID.patch
-0037-armv8-layerscape-Discard-the-needless-cpu-nodes.patch
-0038-board-ls2080a-ls1088a-Add-check-for-mc-dpl-applied-i.patch
-0039-armv8-ls1012ardb-clean-up-definitions-for-I2C-IO-exp.patch
-0040-armv8-ls1012ardb-add-more-board-version-information.patch
-0041-armv8-ls1012ardb-support-hwconfig-for-eSDHC1-enablin.patch
-0042-armv8-ls2080a-Increase-load-image-len-for-NAND-boot.patch
-0043-armv8-ls2085a-Update-README-file-for-NAND-boot.patch
-0044-armv8-ls1046aqds-Adjust-IFC-timing-for-NOR-flash.patch
-0045-common-Fix-up-MAC-addr-in-dts-by-fetching-env-variab.patch
-0046-arm-Add-support-of-updating-dts-before-fix-up.patch
-0047-boards-ls1046ardb-disable-unavailable-ethernet-node-.patch
-0048-armv8-errata-Implement-workaround-for-Cortex-A53-Err.patch
-0049-arm64-ls1046a-Add-sata-distro-boot-support.patch
-0050-arm64-ls1012a-Add-sata-distro-boot-support.patch
-0051-drivers-misc-Share-qbman-init-between-archs.patch
-0052-Move-SYS_DPAA_QBMAN-to-Kconfig.patch
-0053-armv8-ls1012a-Add-USB-2.0-controller-phy-type-for-ls.patch
-0054-usb-ehci-fsl-Fix-some-compile-warnings.patch
-0055-arm64-layerscape-Move-CONFIG_HAS_FSL_DR_USB-to-Kconf.patch
-0056-usb-Add-delay-to-fix-USB-2.0-stick-enumeration-failu.patch
-0057-phy-atheros-set-auto-negotiation-for-AR8021.patch
-0058-arm64-ls1012ardb-Add-distro-secure-boot-support.patch
-0059-armv8-fsl-layerscape-SPL-size-reduction.patch
-0060-armv8-ls1088a-SPL-size-reduction.patch
-0061-Powerpc-T208xQDS-Modify-the-comment-of-the-CONFIG_FS.patch
-0062-configs-SECURE_BOOT-Enable-CONFIG_CMD_EXT4_WRITE.patch
-0063-armv8-ls1088a-Compile-off-DCACHE-for-SPL-size-reduct.patch
-0064-ls1088ardb-Add-SD-Secure-boot-target-support.patch
-0065-ls1088aqds-Enable-IFC-and-QIXIS-in-SPL-image.patch
-0066-serial-lpuart-Proper-device-identification.patch
-0067-LS2088ARDB-Correct-NOR-fall-back-option-failure.patch
-0068-armv8-ls1088-MC-alignment-should-always-be-fixed-to-.patch
-0069-sf-Fix-s25fs512s-erase-size-and-remove-SECT_4K-flag.patch
-0070-u-boot-fixup-the-iommu-map-property-of-fsl-mc-node.patch
-0071-armv8-ls1088a-configure-PMU-s-PCTBENR-to-enable-WDT.patch
-0072-armv8-ls1088aqds-Add-IFC-NOR-as-boot-source-for-LS10.patch
-0073-armv8-ls1088-Add-USB-and-PCI-configs-in-SD-BOOT-defc.patch
-0074-env-sf-Add-support-for-env-init-for-QSPI-NOR.patch
-0075-armv8-kconfig-Align-boards-of-same-family-at-one-pla.patch
-0076-board-ls1012a-LS1012A-2G5RDB-board-support.patch
-0077-sf-add-ADDR_4B-for-4byte-address-support.patch
-0078-spi-fsl_qspi-Add-4bytes-address-support.patch
-0079-driver-fsl-mc-Perform-fsl-mc-fdt-fixup-for-lazyapply.patch
-0080-armv8-fsl-lsch2-correct-QMAN-clock.patch
-0081-armv8-sec_firmware-Add-support-for-multiple-loadable.patch
-0082-armv8-fsl-layerscape-Add-support-of-GPIO-structure.patch
-0083-drivers-net-pfe_eth-LS1012A-PFE-driver-introduction.patch
-0084-drivers-net-pfe_eth-provide-pfe-commands.patch
-0085-drivers-net-pfe_eth-LS1012A-PFE-headers.patch
-0086-board-freescale-ls1012aqds-enable-network-support-on.patch
-0087-board-freescale-ls1012afrdm-enable-network-support-o.patch
-0088-board-freescale-ls1012ardb-enable-network-support-on.patch
-0089-armv8-fsl-lsch2-initialize-pfe-gemac.patch
-0090-armv8-fsl-lsch2-add-pfe-macros-and-update-ccsr_scfg-.patch
-0091-armv8-fsl-lsch2-configure-pfe-s-DDR-and-HDBUS-interf.patch
-0092-armv8-layerscape-csu-enable-ns-access-to-PFE-registe.patch
-0093-configs-ls1012a-add-pfe-configuration-for-LS1012A.patch
-0094-armv8-lsch3-Add-serdes-and-DDR-voltage-setup.patch
-0095-board-common-vid-Add-LS1088A-VID-Supported-voltage-v.patch
-0096-board-common-vid-Add-board-specific-vdd-adjust-API.patch
-0097-board-common-vid-Move-IR-chip-specific-code-in-flag.patch
-0098-Kconfig-Add-LTC3882-voltage-regulator-config.patch
-0099-board-common-vid-Add-support-for-LTC3882-voltage-reg.patch
-0100-ddr-fsl-set-cdr1-first-in-case-0.9v-VDD-is-enabled-f.patch
-0101-ls1088a-ddr-configure-DDR-for-0.9v-for-VID-support.patch
-0102-common-board_f-vid-Add-VID-specific-API-to-adjust-co.patch
-0103-ls1088a-Add-VID-support-for-QDS-and-RDB-platforms.patch
-0104-armv8-ls1088a-vid-Add-some-function-in-SPL-for-VID.patch
-0105-armv8-ls1088ardb-secure-boot-Use-tiny-printf-to-save.patch
-0106-dm-pci-change-bus-number-register-setting-compliant-.patch
-0107-board-ls1012a2g5rdb-avoid-phy-reset.patch
-0108-board-ls1012a-update-mdio-phy-parameters-based-on-se.patch
-0109-board-ls1012a2g5rdb-define-PFE-firmware-address-in-k.patch
-0110-fsl-common-qixis-Add-ifc-and-emmc-switch-support-in-.patch
-0111-armv8-ls1088-Add-qixis-offsets-for-lbmap-and-rcw_src.patch
-0112-armv8-ls1088a-Move-CONFIG_BOOTARGS-and-CONFIG_CMD_GR.patch
-0113-armv8-ls1088-Add-CONFIG_SPI_FLASH_SPANSION-to-sdcard.patch
-0114-ARMv8-ls1046a-Enable-PCIe-and-E1000-in-lpuart-defcon.patch
-0115-EHCI-Fix-endian-access-issue-on-EHCI-intinalization.patch
-0116-ls1088a-Moving-CONFIG_FSL_QSPI-to-defconfig.patch
-0117-qspi-Add-code-to-send-only-aligned-data-to-TxFIFO.patch
-0118-Kconfig-qspi-Add-SPI_ALIGNED_TXFIFO-config-details.patch
-0119-ls1088a-qspi-Enable-config-to-write-aligned-data-to-.patch
-0120-ls2080a-qspi-Enable-config-to-write-aligned-data-to-.patch
-0121-ls2088a-qspi-Enable-config-to-write-aligned-data-to-.patch
-0122-ls2081a-qspi-Enable-config-to-write-aligned-data-to-.patch
-0123-PowerPC-phy-enable-all-phylib-drivers-when-use-phyli.patch
-0124-ls1088a-qspi-Enable-XIP-mode-above-16-MB-addresses.patch
-0125-armv8-sec_firmware-Remove-JR3-from-device-tree-node-.patch
-0126-mmc-fsl_esdhc-fix-probe-issue-without-CONFIG_BLK-ena.patch
-0127-armv8-ls1043ardb_sdcard-delete-CONFIG_SPL_FSL_LS_PPA.patch
-0128-powerpc-configs-Set-initrd_high-environment-varible.patch
-0129-driver-net-fsl-mc-remove-usage-of-CONFIG_FSL_MC_ENET.patch
+0001-armv8-ls1088qds-Remove-CONFIG_-from-local-defines-fo.patch
+0002-armv8-ls1088a-Add-clock-related-function-in-CONFIG_S.patch
+0003-armv8-ls1088a-Add-i2c_early_init-func-for-LS1088AQDS.patch
+0004-armv8-ls1088aqds-Add-IFC-NOR-as-boot-source-for-LS10.patch
+0005-LS2088ARDB-Secure-Boot-Fix-fall-back-option-failure.patch
+0006-drivers-net-phy-Fix-aquantia-compilation-with-DM.patch
+0007-armv8-fsl-layerscape-Add-support-of-GPIO-structure.patch
+0008-drivers-net-pfe_eth-LS1012A-PFE-driver-introduction.patch
+0009-drivers-net-pfe_eth-provide-pfe-commands.patch
+0010-drivers-net-pfe_eth-LS1012A-PFE-headers.patch
+0011-board-freescale-ls1012aqds-enable-network-support-on.patch
+0012-board-freescale-ls1012afrdm-enable-network-support-o.patch
+0013-board-freescale-ls1012ardb-enable-network-support-on.patch
+0014-board-freescale-ls1012a2g5rdb-enable-network-support.patch
+0015-armv8-fsl-lsch2-add-pfe-macros-and-update-ccsr_scfg-.patch
+0016-armv8-fsl-lsch2-configure-pfe-s-DDR-and-HDBUS-interf.patch
+0017-armv8-layerscape-csu-enable-ns-access-to-PFE-registe.patch
+0018-configs-ls1012a-add-pfe-configuration-for-LS1012A.patch
+0019-net-phy-cortina.c-Update-get_phy_id-implementation.patch
+0020-net-phy-cortina-Add-No-firmware-upload-option.patch
+0021-sf-Fix-s25fs512s-erase-size-and-remove-SECT_4K-flag.patch
+0022-sf-add-ADDR_4B-for-4byte-address-support.patch
+0023-spi-fsl_qspi-Add-4bytes-address-support.patch
+0024-ls1088a-Moving-CONFIG_FSL_QSPI-to-defconfig.patch
+0025-qspi-Add-code-to-send-only-aligned-data-to-TxFIFO.patch
+0026-Kconfig-qspi-Add-SPI_ALIGNED_TXFIFO-config-details.patch
+0027-ls1088a-qspi-Enable-config-to-write-aligned-data-to-.patch
+0028-ls2080a-qspi-Enable-config-to-write-aligned-data-to-.patch
+0029-ls2088a-qspi-Enable-config-to-write-aligned-data-to-.patch
+0030-ls2081a-qspi-Enable-config-to-write-aligned-data-to-.patch
+0031-powerpc-configs-Set-initrd_high-environment-varible.patch
+0032-u-boot-fixup-the-iommu-map-property-of-fsl-mc-node.patch
+0033-EHCI-Fix-endian-access-issue-on-EHCI-intinalization.patch
+0034-usb-Add-delay-to-fix-USB-2.0-stick-enumeration-failu.patch
+0035-mmc-fsl_esdhc-fix-probe-issue-without-CONFIG_BLK-ena.patch
+0036-armv8-sec_firmware-Remove-JR3-from-device-tree-node-.patch
+0037-armv8-ls1088aqds-Enable-mdio-commands-on-u-boot-prom.patch
+0038-armv8-ls1088a-Move-CONFIG_BOOTARGS-and-CONFIG_CMD_GR.patch
+0039-driver-net-fsl-mc-updated-copyright-info.patch
+0040-armv8-fsl-lsch2-correct-QMAN-clock.patch
+0041-armv8-sec_firmware-Add-support-for-multiple-loadable.patch
+0042-armv8-fsl-lsch2-make-the-workaround-for-PIN-MUX-erra.patch
+0043-armv8-ls1088a-Enable-USB-in-ls1088ardb_sdcard_qspi_S.patch
+0044-board-move-ppa-firmware-address-in-board-specific-kc.patch
+0045-board-ls1012a-FRWY-LS1012A-board-support.patch
+0046-board-move-ppa-header-address-in-board-specific-kcon.patch
+0047-LS1012AFRWY-Add-Secure-Boot-support.patch
+0048-driver-mtd-spi-Default-page-size-Spansion-flash-S25F.patch
+0049-board-freescale-ls1012ardb-Add-command-to-switch-QSP.patch
+0050-arm-ls1021aqds-config-enable-CONFIG_ID_EEPROM-for-ma.patch
+0051-board-Kconfig-Re-Arrangement-of-PPA-firmware-and-hea.patch
+0052-drivers-net-vsc9953-Initialize-action-RAM-in-VCAP-co.patch
+0053-armv8-ls1088a-change-dpl-load-command-from-apply-to-.patch
+0054-boards-freescale-lsch3-Add-0.9v-entry-for-vid.patch
+0055-armv8-ls1088-change-ttyS1-to-ttyS0.patch
+0056-watchdog-driver-support-for-layerscape.patch
+0057-watchdog-Kconfig-add-config-to-disable-wdog-reset.patch
+0058-watchdog-disable-to-build-the-driver-in-default.patch
+0059-board-freescale-ls1012afrx-Common-files-to-support.patch
+0060-board-freescale-ls1012afrwy-Add-LS1012A-FRWY-board-s.patch
+0061-armv8-ls1088a-change-dpl-load-address-to-0x80001000-.patch
+0062-LS1043ARBD-Fix-SD-Boot-issue-with-PPA.patch
+0063-Revert-powerpc-p1_p2_rdb_pc-Fix-endian-access-issue-.patch
+0064-Revert-powerpc-T104xRDB-Fix-endian-access-issue-on-E.patch
+0065-Revert-EHCI-Fix-endian-access-issue-on-EHCI-intinali.patch
+0066-armv8-ls2080ardb-update-copyright-claim.patch
+0067-LS1088ARDB-Secure-Boot-Change-load-address-of-dpl-he.patch
+0068-armv8-LS1088ARDB-Fix-QUBOOT-3935.patch
+0069-armv8-layerscape-Enable-EHCI-access-for-LS1012A.patch
+0070-net-fman-Support-both-new-and-legacy-FMan-Compatible.patch
+0071-armv8-fsl-layerscape-add-missing-register-blocks-bas.patch
+0072-armv8-ls1046a-advertise-QMan-v3-in-configuration.patch
+0073-misc-fsl_portals-setup-QMAN_BAR-E-also-on-ARM-platfo.patch
+0074-armv8-fsl-layerscape-add-missing-debug-stream-ID.patch
+0075-armv8-ls1046a-initial-icid-setup-support.patch
+0076-armv8-ls1046a-add-icid-setup-for-qman-portals.patch
+0077-armv8-ls1046a-setup-fman-ports-ICIDs-and-device-tree.patch
+0078-armv8-ls1046a-setup-SEC-ICIDs-and-fix-up-device-tree.patch
+0079-armv8-ls1043a-advertise-QMan-v3-in-configuration.patch
+0080-armv8-ls1043a-add-icid-setup-support.patch
+0081-ls1088ardb_pb-Add-support-for-ls1088ardb_pb-board.patch
+0082-armv8-icid-fix-set_icids-call.patch
+0083-ls1088ardb_pb-remove-sd-u-boot-support.patch
+0084-qe-kconfig-U-QE-kconfig.patch
+0085-arm-layerscape-Remove-CONFIG_U_QE-define-in-ls1012at.patch
+0086-armv7-ls102xa-Disable-QE-before-enter-deep-sleep.patch
+0087-ls1012afrwy-Add-ls1012afrwy-revC-board-support.patch
+0088-armv8-layerscape-fix-compilation-warning-unused-ns_d.patch
+0089-driver-net-fsl-mc-Memset-MC-reserve-red-memory-befor.patch
+0090-ls1088ardb_pb-Add-SD-boot-support.patch
+0091-Revert-armv8-icid-fix-set_icids-call.patch
+0092-Revert-armv8-ls1043a-add-icid-setup-support.patch
+0093-Revert-armv8-ls1043a-advertise-QMan-v3-in-configurat.patch
+0094-Revert-armv8-ls1046a-setup-SEC-ICIDs-and-fix-up-devi.patch
+0095-Revert-armv8-ls1046a-setup-fman-ports-ICIDs-and-devi.patch
+0096-Revert-armv8-ls1046a-add-icid-setup-for-qman-portals.patch
+0097-Revert-armv8-ls1046a-initial-icid-setup-support.patch
+0098-Revert-armv8-fsl-layerscape-add-missing-debug-stream.patch
+0099-Revert-misc-fsl_portals-setup-QMAN_BAR-E-also-on-ARM.patch
+0100-Revert-armv8-ls1046a-advertise-QMan-v3-in-configurat.patch
+0101-Revert-armv8-fsl-layerscape-add-missing-register-blo.patch
+0102-Revert-driver-net-fsl-mc-Memset-MC-reserve-red-memor.patch
+0103-driver-net-fsl-mc-Memset-MC-reserve-ram-memory-befor.patch
+0104-ls1088ardb_pb-Secure-boot-Change-bootscript-and-head.patch
+0105-ls1012a-remove-debug-info-from-u-boot-log.patch
+0106-ls1088a-remove-dhcp-function-from-u-boot-env-as-boot.patch
+0107-ls2080ardb-remove-dhcp-function-from-u-boot-env-as-b.patch
 boot-qspi-add-support-for-qspi-boot.patch
 platform-ls1043ardb-add-ONIE-support.patch

machine/nxp/nxp_ls1046ardb/machine.make

@@ -34,7 +34,7 @@ KEXEC_ENABLE = yes
 UBOOT_DTB_ENABLE = yes
 
 # Set the desired U-Boot version
-UBOOT_VERSION = 2017.11
+UBOOT_VERSION = 2018.03
 
 # Specify Linux kernel version -- comment out to use the default
 LINUX_VERSION = 4.9

machine/nxp/nxp_ls1046ardb/u-boot/platform-ls1046ardb-add-ONIE-support.patch

@@ -1,4 +1,4 @@
-From 6054a84fa0aa1dd622478bfcf3bcbe7f7b58574d Mon Sep 17 00:00:00 2001
+From 5502e62e7ef38483c04b3b4bfce2d0c937d2bc40 Mon Sep 17 00:00:00 2001
 From: Zhao Qiang <[email protected]>
 Date: Thu, 7 Dec 2017 15:04:24 +0800
 Subject: [PATCH] platform: ls1046ardb: add ONIE support
@@ -7,19 +7,20 @@ Add ONIE support for Freescale ls1046ardb platform.
 
 Signed-off-by: Zhao Qiang <[email protected]>
 ---
- configs/ls1046ardb_ONIE_0_defconfig | 40 ++++++++++++++++++++++++++++++++
- include/configs/ls1046ardb.h        | 46 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 86 insertions(+)
+ configs/ls1046ardb_ONIE_0_defconfig | 41 +++++++++++++++++++++++
+ include/configs/ls1046ardb.h        | 52 +++++++++++++++++++++++++++++
+ 2 files changed, 93 insertions(+)
  create mode 100644 configs/ls1046ardb_ONIE_0_defconfig
 
 diff --git a/configs/ls1046ardb_ONIE_0_defconfig b/configs/ls1046ardb_ONIE_0_defconfig
 new file mode 100644
-index 0000000..4a6ff6e
+index 0000000..d09cd19
 --- /dev/null
 +++ b/configs/ls1046ardb_ONIE_0_defconfig
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,41 @@
 +CONFIG_ARM=y
 +CONFIG_TARGET_LS1046ARDB=y
++CONFIG_SYS_TEXT_BASE=0x40100000
 +CONFIG_FSL_LS_PPA=y
 +CONFIG_QSPI_AHB_INIT=y
 +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
@@ -59,10 +60,10 @@ index 0000000..4a6ff6e
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_STORAGE=y
 diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
-index 2755f1c..7457150 100644
+index d63badf..703d54b 100644
 --- a/include/configs/ls1046ardb.h
 +++ b/include/configs/ls1046ardb.h
-@@ -223,5 +223,51 @@
+@@ -217,5 +217,57 @@
  #endif
 
  #include <asm/fsl_secure_boot.h>
@@ -88,6 +89,12 @@ index 2755f1c..7457150 100644
 +#undef CONFIG_CMD_EXT2
 +#undef CONFIG_CMD_DHCP
 +#undef CONFIG_IDENT_STRING
++#undef CONFIG_SYS_LONGHELP
++#undef CONFIG_AUTO_COMPLETE
++#undef CONFIG_BOOTP_BOOTPATH
++#undef CONFIG_BOOTP_GATEWAY
++#undef CONFIG_BOOTP_HOSTNAME
++#undef CONFIG_BOOTP_SUBNETMASK
 +
 +#include "configs/common_config.h"
 +
@@ -115,5 +122,5 @@ index 2755f1c..7457150 100644
 
  #endif /* __LS1046ARDB_H__ */
 -- 
-2.7.4
+2.17.1