From dcf57c766acc5224e05f62cf5fae2d965abace59 Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Wed, 4 Jul 2018 12:20:41 +0800
Subject: layerscape: update u-boot to LSDK-18.06

The u-boot source code had been migrated to codeaurora
for LSDK-18.06 release and the future release. This
patch is to update u-boot to LSDK-18.06 for both
uboot-layerscape and uboot-layerscape-armv8_32b packages.
Besides, this patch also introduced some other changes.
- Reworked uboot-layerscape makefile to make it more
  readable.
- Define package in uboot-layerscape-armv8_32b for each board.
- Fixed u-boot package selection in target image makefile.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 package/boot/uboot-layerscape/Makefile | 53 +++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'package/boot/uboot-layerscape/Makefile')

diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile
index 1805c1f0d3..9e4079e386 100644
--- a/package/boot/uboot-layerscape/Makefile
+++ b/package/boot/uboot-layerscape/Makefile
@@ -6,16 +6,15 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=uboot-layerscape
-PKG_SOURCE_DATE:=2017-12-07
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/qoriq-open-source/u-boot.git
-PKG_SOURCE_VERSION:=9f7df1b406ff11409021cd2112beedd6b57bb600
-PKG_MIRROR_HASH:=b3756f814b731af2d03b0582ece90b2de564955b778f341fbfc34fa9bd849819
+PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot
+PKG_SOURCE_VERSION:=b3f98d438eefd1b355efdec0b50af5813ff8d0e1
+PKG_MIRROR_HASH:=59e35957055658e7fdefb16b92f954356985a8191942d93f254861c75c47b32b
 
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
@@ -25,49 +24,49 @@ define U-Boot/Default
   BUILD_SUBTARGET:=armv8_64b
   BUILD_DEVICES:=$(1)
   UBOOT_IMAGE:=u-boot-dtb.bin
-  HIDDEN:=y
+endef
+
+define U-Boot/ls1012ardb
+  NAME:=NXP LS1012ARDB
+  UBOOT_CONFIG:=ls1012ardb_qspi
+endef
+
+define U-Boot/ls1012afrdm
+  NAME:=NXP LS1012AFRDM
+  UBOOT_CONFIG:=ls1012afrdm_qspi
 endef
 
 define U-Boot/ls1043ardb
-  NAME:=NXP ls1043ardb 64b Dev Board
+  NAME:=NXP LS1043ARDB
 endef
 
 define U-Boot/ls1046ardb
-  NAME:=NXP ls1046ardb 64b Dev Board
+  NAME:=NXP LS1046ARDB
   UBOOT_CONFIG:=ls1046ardb_qspi
 endef
 
-define U-Boot/ls1012ardb
-  NAME:=NXP ls1012ardb 64b Dev Board
-  UBOOT_CONFIG:=ls1012ardb_qspi
-endef
-
 define U-Boot/ls1088ardb
-  NAME:=NXP ls1088ardb 64b Dev Board
+  NAME:=NXP LS1088ARDB
   UBOOT_CONFIG:=ls1088ardb_qspi
 endef
 
 define U-Boot/ls2088ardb
-  NAME:=NXP ls2088ardb 64b Dev Board
+  NAME:=NXP LS2088ARDB
   UBOOT_CONFIG:=ls2080ardb
 endef
 
-define U-Boot/ls1012afrdm
-  NAME:=NXP ls1012afrdm 64b Dev Board
-  UBOOT_CONFIG:=ls1012afrdm_qspi
-endef
-
 UBOOT_TARGETS := \
-	ls1043ardb \
-	ls1046ardb \
-	ls1012ardb \
-	ls1088ardb \
-	ls2088ardb \
-	ls1012afrdm
+  ls1012ardb \
+  ls1012afrdm \
+  ls1043ardb \
+  ls1046ardb \
+  ls1088ardb \
+  ls2088ardb
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(BUILD_SUBTARGET)-uboot.bin
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) \
+		$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.bin
 endef
 
 define Package/u-boot/install/default
-- 
cgit v1.2.3